[jboss-svn-commits] JBoss Portal SVN: r5448 - in trunk: cms cms/src/main/org/jboss/portal/cms cms/src/main/org/jboss/portal/cms/hibernate cms/src/main/org/jboss/portal/cms/hibernate/state cms/src/main/org/jboss/portal/cms/impl cms/src/main/org/jboss/portal/cms/impl/cache cms/src/main/org/jboss/portal/cms/impl/interceptors cms/src/main/org/jboss/portal/cms/impl/jcr cms/src/main/org/jboss/portal/cms/impl/jcr/command cms/src/main/org/jboss/portal/cms/impl/jcr/composite cms/src/main/org/jboss/portal/cms/impl/jcr/ha cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit cms/src/main/org/jboss/portal/cms/impl/jcr/util cms/src/main/org/jboss/portal/cms/model cms/src/main/org/jboss/portal/cms/util cms/src/main/org/jboss/portal/test/cms cms/src/main/org/jboss/portal/test/cms/clustering cms/src/main/org/jboss/portal/test/cms/commands cms/src/main/org/jboss/portal/test/cms/mock cms/src/resources/hibernate cms/src/resources/portal-cms-jar/org/jboss/portal/cms cms/src/resources/test cms/src/resourc! es/test/cms/clustering/sar/META-INF cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF cms/src/resources/test/jcr core core/src/etc/jboss-aop core/src/main/org/jboss/portal/core core/src/main/org/jboss/portal/core/aspects/controller core/src/main/org/jboss/portal/core/aspects/controller/node core/src/main/org/jboss/portal/core/aspects/portlet core/src/main/org/jboss/portal/core/aspects/server core/src/main/org/jboss/portal/core/cms core/src/main/org/jboss/portal/core/cms/servlet core/src/main/org/jboss/portal/core/controller core/src/main/org/jboss/portal/core/controller/ajax core/src/main/org/jboss/portal/core/controller/command core/src/main/org/jboss/portal/core/controller/command/info core/src/main/org/jboss/portal/core/controller/command/mapper core/src/main/org/jboss/portal/core/controller/command/response core/src/main/org/jboss/portal/core/controller/portlet core/src/main/org/jboss/porta! l/core/deployment core/src/main/org/jboss/portal/core/deployment/jboss core/src/main/org/jboss/portal/core/event core/src/main/org/jboss/portal/core/hibernate core/src/main/org/jboss/portal/core/impl/invocation core/src/main/org/jboss/portal/core/impl/mail core/src/main/org/jboss/portal/core/impl/model/instance core/src/main

[jboss-svn-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-10-13 15:29:17 -0400 (Fri, 13 Oct 2006)
New Revision: 5448

Modified:
   trunk/cms/build.xml
   trunk/cms/src/main/org/jboss/portal/cms/CMS.java
   trunk/cms/src/main/org/jboss/portal/cms/CMSException.java
   trunk/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java
   trunk/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java
   trunk/cms/src/main/org/jboss/portal/cms/Command.java
   trunk/cms/src/main/org/jboss/portal/cms/CommandFactory.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java
   trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/ClusteredCacheListener.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java
   trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java
   trunk/cms/src/main/org/jboss/portal/cms/model/CMSObject.java
   trunk/cms/src/main/org/jboss/portal/cms/model/Content.java
   trunk/cms/src/main/org/jboss/portal/cms/model/File.java
   trunk/cms/src/main/org/jboss/portal/cms/model/Folder.java
   trunk/cms/src/main/org/jboss/portal/cms/util/FileUtil.java
   trunk/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java
   trunk/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java
   trunk/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java
   trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
   trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java
   trunk/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java
   trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java
   trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java
   trunk/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java
   trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java
   trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java
   trunk/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java
   trunk/cms/src/resources/hibernate/domain.hbm.xml
   trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml
   trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml
   trunk/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml
   trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml
   trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml
   trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml
   trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml
   trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml
   trunk/cms/src/resources/test/jcr/fs-repository.xml
   trunk/cms/src/resources/test/jcr/repository.xml
   trunk/cms/src/resources/test/log4j.xml
   trunk/cms/src/resources/test/pm-cache.xml
   trunk/core/build.xml
   trunk/core/src/etc/jboss-aop/base-aop.xml
   trunk/core/src/main/org/jboss/portal/core/CoreConstants.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/WindowCacheInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java
   trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java
   trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java
   trunk/core/src/main/org/jboss/portal/core/cms/StreamContentCommand.java
   trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java
   trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java
   trunk/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java
   trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java
   trunk/core/src/main/org/jboss/portal/core/controller/ControllerException.java
   trunk/core/src/main/org/jboss/portal/core/controller/ControllerInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/controller/ControllerSecurityException.java
   trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java
   trunk/core/src/main/org/jboss/portal/core/controller/InsufficientTransportGuaranteeException.java
   trunk/core/src/main/org/jboss/portal/core/controller/ResourceAccessDeniedException.java
   trunk/core/src/main/org/jboss/portal/core/controller/ResourceNotFoundException.java
   trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java
   trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowActionCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowRenderCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/MoveWindowCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/PageCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/PortalCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/PortalObjectCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/RenderWindowCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/ViewDashboardCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/WindowCommand.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactoryDelegate.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactoryService.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactoryDelegate.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/response/PortletResponse.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateViewResponse.java
   trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateWindowMarkupResponse.java
   trunk/core/src/main/org/jboss/portal/core/controller/portlet/AuthenticateResponse.java
   trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerActionContext.java
   trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletInvocationContext.java
   trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerRenderContext.java
   trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java
   trunk/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java
   trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
   trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
   trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
   trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
   trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java
   trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java
   trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java
   trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java
   trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java
   trunk/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java
   trunk/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java
   trunk/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java
   trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java
   trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java
   trunk/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java
   trunk/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
   trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java
   trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java
   trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
   trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.java
   trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java
   trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java
   trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java
   trunk/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java
   trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java
   trunk/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/DashboardCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/Page.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/Portal.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/Window.java
   trunk/core/src/main/org/jboss/portal/core/model/portal/WindowContextImpl.java
   trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java
   trunk/core/src/main/org/jboss/portal/core/modules/MailModule.java
   trunk/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java
   trunk/core/src/main/org/jboss/portal/core/modules/ModuleException.java
   trunk/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java
   trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminConstants.java
   trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java
   trunk/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java
   trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java
   trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
   trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/AbstractContext.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/BuildException.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/ChildrenStrategy.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java
   trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java
   trunk/core/src/main/org/jboss/portal/core/util/ProxyValidator.java
   trunk/core/src/main/org/jboss/portal/core/util/RewriteHelper.java
   trunk/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java
   trunk/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/MapperTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/PageTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/Utils.java
   trunk/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java
   trunk/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java
   trunk/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java
   trunk/core/src/main/org/jboss/portlet/JBossAPIFactory.java
   trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java
   trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java
   trunk/core/src/main/org/jboss/portlet/JBossPortlet.java
   trunk/core/src/main/org/jboss/portlet/JBossPortletPreferences.java
   trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java
   trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java
   trunk/core/src/main/org/jboss/portlet/session/PortletSessionListener.java
   trunk/core/src/main/org/jboss/portlet/util/Parameters.java
   trunk/core/src/resources/dtd/jboss-app_2_0.dtd
   trunk/core/src/resources/dtd/jboss-portlet_2_0.dtd
   trunk/core/src/resources/dtd/portal-layouts_2_0.dtd
   trunk/core/src/resources/dtd/portal-renderSet_2_0.dtd
   trunk/core/src/resources/dtd/portal-strategies_2_0.dtd
   trunk/core/src/resources/dtd/portal-themes_2_0.dtd
   trunk/core/src/resources/dtd/portal_2_0.dtd
   trunk/core/src/resources/dtd/portlet-instances_2_0.dtd
   trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
   trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
   trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
   trunk/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml
   trunk/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
   trunk/core/src/resources/portal-cms-war/WEB-INF/web.xml
   trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
   trunk/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
   trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties
   trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties
   trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
   trunk/core/src/resources/portal-core-sar/conf/config.xml
   trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml
   trunk/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
   trunk/core/src/resources/portal-core-sar/conf/login-config.xml
   trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml
   trunk/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld
   trunk/core/src/resources/portal-core-sar/portal-aop.xml
   trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
   trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml
   trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
   trunk/core/src/resources/portal-core-war/WEB-INF/faces-config.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld
   trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml
   trunk/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld
   trunk/core/src/resources/portal-core-war/WEB-INF/web.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource.properties
   trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_fr.properties
   trunk/core/src/resources/portal-samples-war/WEB-INF/default-object.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp
   trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/news/edit.jsp
   trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
   trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/weather/edit.jsp
   trunk/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/portlet.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/web.xml
   trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl
   trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl
   trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl
   trunk/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml
   trunk/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml
   trunk/core/src/resources/portal-server-war/WEB-INF/web.xml
   trunk/core/src/resources/portal-server-war/error.jsp
   trunk/core/src/resources/portal-server-war/login.jsp
   trunk/core/src/resources/setup/portal-ds.xml
   trunk/core/src/resources/test/cache/domain.xml
   trunk/core/src/resources/test/cache/local.xml
   trunk/core/src/resources/test/cache/replicated.xml
   trunk/core/src/resources/test/datarole.xml
   trunk/core/src/resources/test/datarolecreated.xml
   trunk/core/src/resources/test/dataroledeleted.xml
   trunk/core/src/resources/test/dataroleedited.xml
   trunk/core/src/resources/test/deployment/jboss-portlet.xml
   trunk/core/src/resources/test/hibernate.properties
   trunk/core/src/resources/test/log4j.properties
   trunk/core/src/resources/test/theme.xml
   trunk/faces/build.xml
   trunk/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java
   trunk/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java
   trunk/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java
   trunk/faces/src/main/org/jboss/portal/faces/el/TypeDef.java
   trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java
   trunk/faces/src/main/org/jboss/portal/faces/matrix/Cell.java
   trunk/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java
   trunk/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java
   trunk/faces/src/main/org/jboss/portal/faces/matrix/Row.java
   trunk/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java
   trunk/faces/src/resources/portal-faces-lib-jar/composite.tld
   trunk/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml
   trunk/faces/src/resources/portal-faces-war/WEB-INF/web.xml
   trunk/federation/build.xml
   trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java
   trunk/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java
   trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java
   trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
   trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java
   trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java
   trunk/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java
   trunk/format/build.xml
   trunk/format/src/main/org/jboss/portal/format/parser/AbstractParser.java
   trunk/format/src/main/org/jboss/portal/format/parser/ParseEvent.java
   trunk/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java
   trunk/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java
   trunk/format/src/main/org/jboss/portal/format/parser/TextEvent.java
   trunk/format/src/main/org/jboss/portal/format/parser/Token.java
   trunk/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java
   trunk/format/src/main/org/jboss/portal/format/parser/chars/Chars.java
   trunk/format/src/main/org/jboss/portal/format/parser/chars/Filter.java
   trunk/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java
   trunk/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java
   trunk/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java
   trunk/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java
   trunk/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java
   trunk/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java
   trunk/format/src/main/org/jboss/portal/format/parser/html/TagParser.java
   trunk/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java
   trunk/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java
   trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java
   trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java
   trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java
   trunk/format/src/main/org/jboss/portal/format/template/AbstractContext.java
   trunk/format/src/main/org/jboss/portal/format/template/BuildException.java
   trunk/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java
   trunk/format/src/main/org/jboss/portal/format/template/Context.java
   trunk/format/src/main/org/jboss/portal/format/template/DelegateContext.java
   trunk/format/src/main/org/jboss/portal/format/template/Template.java
   trunk/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java
   trunk/format/src/main/org/jboss/portal/format/template/TemplateLoader.java
   trunk/format/src/main/org/jboss/portal/format/template/TemplateParser.java
   trunk/format/src/main/org/jboss/portal/format/template/TemplateRepository.java
   trunk/format/src/main/org/jboss/portal/format/template/TemplateUtils.java
   trunk/format/src/main/org/jboss/portal/format/util/CLLoader.java
   trunk/format/src/main/org/jboss/portal/format/util/EntityTable.java
   trunk/format/src/main/org/jboss/portal/format/util/Loader.java
   trunk/format/src/main/org/jboss/portal/format/util/Stack.java
   trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java
   trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java
   trunk/forums/build.xml
   trunk/forums/src/main/org/jboss/portlet/forums/Context.java
   trunk/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java
   trunk/forums/src/main/org/jboss/portlet/forums/ForumsModule.java
   trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/Action.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/EditPostAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/ForumAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/NewTopicAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/PostAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/ProcessCommandAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/ReplyAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/action/TopicAction.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/AbstractCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/ActionCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/AttributeType.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/Command.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/CommandConstants.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/CommandException.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/CompositeCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/Configurator.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/EmptyConfigurator.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/NoSuchAttachmentException.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/ReflectedConfigurator.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/UnexpectedCommandException.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/filter/AbstractCommandFilter.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CommandFilter.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CompositeFilter.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/filter/ExecuteFilter.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/result/CompositeResult.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/result/ImmutableResult.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/result/Result.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/result/ResultType.java
   trunk/forums/src/main/org/jboss/portlet/forums/command/result/SimpleResult.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/AbstractCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/BBAttributeType.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/CommandConstants.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeResult.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/SimpleResultType.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/ValidationException.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateCategoryCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateForumCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteCategoryCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteForumCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveCategoryCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveForumCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderCategoryCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderForumCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateCategoryCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateForumCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/DeleteTopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/LockTopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/MoveTopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/SplitTopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePollCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePostCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/EditPostCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ForumCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/NewTopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostTools.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ReplyCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/RepostCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/TopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/commands/post/VoteTopicCommand.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentToken.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentTokenManager.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/FileBinding.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/ForumsTools.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/Goto.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/GotoWithOffset.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/IndexIterator.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/Range.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/TempFileBinding.java
   trunk/forums/src/main/org/jboss/portlet/forums/helper/Time.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java
   trunk/forums/src/main/org/jboss/portlet/forums/interceptors/FloodControlInterceptor.java
   trunk/forums/src/main/org/jboss/portlet/forums/interceptors/IndexInterceptor.java
   trunk/forums/src/main/org/jboss/portlet/forums/interceptors/NotificationInterceptor.java
   trunk/forums/src/main/org/jboss/portlet/forums/interceptors/ResourceCacheInvalidatorInterceptor.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Attachment.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/AuthType.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Category.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Forum.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/ForumWatch.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Message.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Poll.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/PollOption.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Post.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Poster.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Topic.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/TopicWatch.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/UploadedFile.java
   trunk/forums/src/main/org/jboss/portlet/forums/model/Watch.java
   trunk/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java
   trunk/forums/src/main/org/jboss/portlet/forums/properties/XProperties.java
   trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java
   trunk/forums/src/main/org/jboss/portlet/forums/theme/FolderType.java
   trunk/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AdminFullTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPollPostEditTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPostTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AdminTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/AnonymousUserTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/CategoryModelTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/ForumModelTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/ForumsModelTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/PostModelTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/TestConstants.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/TopicModelTestCase.java
   trunk/forums/src/main/org/jboss/portlet/test/forums/UserTestCase.java
   trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml
   trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
   trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
   trunk/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml
   trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-object.xml
   trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml
   trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-portlet.xml
   trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-web.xml
   trunk/forums/src/resources/portal-forums-war/WEB-INF/portal-lib.tld
   trunk/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml
   trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml
   trunk/forums/src/resources/test/forums.xml
   trunk/identity/build.xml
   trunk/identity/src/main/org/jboss/portal/identity/IdentityException.java
   trunk/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java
   trunk/identity/src/main/org/jboss/portal/identity/ProfileMap.java
   trunk/identity/src/main/org/jboss/portal/identity/Role.java
   trunk/identity/src/main/org/jboss/portal/identity/RoleModule.java
   trunk/identity/src/main/org/jboss/portal/identity/User.java
   trunk/identity/src/main/org/jboss/portal/identity/UserModule.java
   trunk/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java
   trunk/identity/src/main/org/jboss/portal/identity/auth/UserPrincipal.java
   trunk/identity/src/main/org/jboss/portal/identity/db/DBRoleModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity/db/DBUserModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity/db/ProfileMapImpl.java
   trunk/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity/db/UserImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/LDAPMembershipStrategy.java
   trunk/identity/src/main/org/jboss/portal/identity2/MembershipModule.java
   trunk/identity/src/main/org/jboss/portal/identity2/ProfileMap.java
   trunk/identity/src/main/org/jboss/portal/identity2/Role.java
   trunk/identity/src/main/org/jboss/portal/identity2/RoleModule.java
   trunk/identity/src/main/org/jboss/portal/identity2/User.java
   trunk/identity/src/main/org/jboss/portal/identity2/UserModule.java
   trunk/identity/src/main/org/jboss/portal/identity2/UserProfileModule.java
   trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPConnectionContext.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtRoleModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtUserModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPMembershipModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPOperation.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSession.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSessionService.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticGroupLDAPMembershipStrategyImpl.java
   trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticRoleLDAPMembershipStrategyImpl.java
   trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPMembershipStrategyTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleRoleModuleTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleUserModuleTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticGroupStrategyTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticRoleStrategyTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/LDAPUserTestCase.java
   trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java
   trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java
   trunk/identity/src/resources/hibernate/domain.hbm.xml
   trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml
   trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml
   trunk/jems/build.xml
   trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java
   trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java
   trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java
   trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java
   trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java
   trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java
   trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java
   trunk/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java
   trunk/portlet/build.xml
   trunk/portlet/src/main/org/jboss/portal/portlet/ActionURL.java
   trunk/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java
   trunk/portlet/src/main/org/jboss/portal/portlet/Parameters.java
   trunk/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java
   trunk/portlet/src/main/org/jboss/portal/portlet/Portlet.java
   trunk/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/PortletContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java
   trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java
   trunk/portlet/src/main/org/jboss/portal/portlet/PortletURL.java
   trunk/portlet/src/main/org/jboss/portal/portlet/Properties.java
   trunk/portlet/src/main/org/jboss/portal/portlet/RenderURL.java
   trunk/portlet/src/main/org/jboss/portal/portlet/StateEvent.java
   trunk/portlet/src/main/org/jboss/portal/portlet/StateString.java
   trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java
   trunk/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java
   trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
   trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java
   trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
   trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
   trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterService.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterV0.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateManagementPolicyService.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java
   trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/producer/ProducerPersistenceManagerService.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/RenderInvocation.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/AccessDeniedResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/ErrorResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/FragmentResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RenderResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/StreamResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/SoftTimedContent.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/StrongTimedContent.java
   trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/TimedContent.java
   trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java
   trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java
   trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java
   trunk/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java
   trunk/portlet/src/main/org/jboss/portal/portlet/session/Modification.java
   trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java
   trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java
   trunk/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/DestroyCloneFailure.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/InvalidStateIdException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/NoSuchStateException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletClonedEvent.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletModifiedEvent.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/Property.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConversionException.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConverter.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/StateManagementPolicy.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerState.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPersistenceManager.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerState.java
   trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerStateContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/ActionContextImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/InstanceContextImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/UserContextImpl.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/MetaInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java
   trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreConsumerStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreConsumerStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java
   trunk/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java
   trunk/portlet/src/resources/samples-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/samples-war/WEB-INF/web.xml
   trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml
   trunk/portlet/src/resources/tck-sar/conf/config.xml
   trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
   trunk/portlet/src/resources/test-sar/conf/config.xml
   trunk/portlet/src/resources/test-war/WEB-INF/jboss-web.xml
   trunk/portlet/src/resources/test-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/deployment/jboss-portlet.xml
   trunk/portlet/src/resources/test/deployment/portlet.xml
   trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml
   trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
   trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml
   trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml
   trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
   trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml
   trunk/security/build.xml
   trunk/security/imports/test-jars.xml
   trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java
   trunk/security/src/main/org/jboss/portal/security/PortalPermission.java
   trunk/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java
   trunk/security/src/main/org/jboss/portal/security/PortalSecurityException.java
   trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java
   trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java
   trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java
   trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
   trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java
   trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
   trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java
   trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java
   trunk/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java
   trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java
   trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java
   trunk/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java
   trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java
   trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java
   trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java
   trunk/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java
   trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java
   trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java
   trunk/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java
   trunk/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java
   trunk/security/src/main/org/jboss/portal/test/security/FlatPermission.java
   trunk/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java
   trunk/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java
   trunk/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java
   trunk/security/src/main/org/jboss/portal/test/security/Server.java
   trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java
   trunk/security/src/resources/log4j.xml
   trunk/server/build.xml
   trunk/server/src/main/org/jboss/portal/server/AbstractServerURL.java
   trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
   trunk/server/src/main/org/jboss/portal/server/RequestController.java
   trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java
   trunk/server/src/main/org/jboss/portal/server/Server.java
   trunk/server/src/main/org/jboss/portal/server/ServerException.java
   trunk/server/src/main/org/jboss/portal/server/ServerInterceptor.java
   trunk/server/src/main/org/jboss/portal/server/ServerInvocation.java
   trunk/server/src/main/org/jboss/portal/server/ServerInvocationContext.java
   trunk/server/src/main/org/jboss/portal/server/ServerInvocationContextFactory.java
   trunk/server/src/main/org/jboss/portal/server/ServerRequest.java
   trunk/server/src/main/org/jboss/portal/server/ServerResponse.java
   trunk/server/src/main/org/jboss/portal/server/ServerURL.java
   trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java
   trunk/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java
   trunk/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java
   trunk/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java
   trunk/server/src/main/org/jboss/portal/server/config/ServerConfig.java
   trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java
   trunk/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java
   trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java
   trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
   trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java
   trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java
   trunk/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java
   trunk/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java
   trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
   trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java
   trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java
   trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java
   trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java
   trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java
   trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java
   trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStackFactory.java
   trunk/server/src/main/org/jboss/portal/server/request/URLContext.java
   trunk/server/src/main/org/jboss/portal/server/request/URLFormat.java
   trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java
   trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java
   trunk/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java
   trunk/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java
   trunk/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java
   trunk/server/src/main/org/jboss/portal/server/servlet/PathMapping.java
   trunk/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java
   trunk/server/src/main/org/jboss/portal/server/servlet/PathParser.java
   trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
   trunk/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java
   trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java
   trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java
   trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java
   trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
   trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java
   trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
   trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
   trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
   trunk/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java
   trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
   trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
   trunk/server/src/main/org/jboss/portal/test/server/parameters/Utils.java
   trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
   trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
   trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
   trunk/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java
   trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml
   trunk/server/src/resources/portal-server-sar/conf/config.xml
   trunk/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml
   trunk/server/src/resources/test-agent-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
   trunk/server/src/resources/test/test-charset-sar/conf/config.xml
   trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
   trunk/server/src/resources/test/test-parameters-sar/conf/config.xml
   trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml
   trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
   trunk/server/src/resources/test/test-servlet-sar/conf/config.xml
   trunk/server/src/resources/test/test-session-war/WEB-INF/web.xml
   trunk/test/build.xml
   trunk/test/src/etc/datasources.xml
   trunk/test/src/etc/directories.xml
   trunk/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java
   trunk/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java
   trunk/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java
   trunk/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java
   trunk/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/result/Result.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java
   trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java
   trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java
   trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java
   trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java
   trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSService.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSServiceMBean.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java
   trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSUtil.java
   trunk/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java
   trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java
   trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java
   trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java
   trunk/test/src/main/org/jboss/portal/test/framework/server/NodeId.java
   trunk/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java
   trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml
   trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml
   trunk/testsuite/build.xml
   trunk/testsuite/imports/server-config.xml
   trunk/theme/build.xml
   trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
   trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java
   trunk/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java
   trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java
   trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java
   trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java
   trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java
   trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
   trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java
   trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java
   trunk/theme/src/main/org/jboss/portal/theme/FQN.java
   trunk/theme/src/main/org/jboss/portal/theme/LayoutConstants.java
   trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java
   trunk/theme/src/main/org/jboss/portal/theme/LayoutException.java
   trunk/theme/src/main/org/jboss/portal/theme/LayoutInfo.java
   trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java
   trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java
   trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java
   trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java
   trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java
   trunk/theme/src/main/org/jboss/portal/theme/RuntimeContext.java
   trunk/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeElement.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeException.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeResult.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java
   trunk/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java
   trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java
   trunk/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java
   trunk/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java
   trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java
   trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java
   trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java
   trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java
   trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java
   trunk/theme/src/main/org/jboss/portal/theme/page/Region.java
   trunk/theme/src/main/org/jboss/portal/theme/page/RegionNames.java
   trunk/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java
   trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java
   trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java
   trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java
   trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java
   trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
   trunk/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java
   trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java
   trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
   trunk/theme/src/main/org/jboss/portal/theme/render/RenderException.java
   trunk/theme/src/main/org/jboss/portal/theme/render/Renderer.java
   trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java
   trunk/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java
   trunk/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java
   trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java
   trunk/theme/src/resources/portal-ajax-war/WEB-INF/jboss-web.xml
   trunk/theme/src/resources/portal-ajax-war/WEB-INF/web.xml
   trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml
   trunk/theme/src/resources/test/theme-test-sar/conf/config.xml
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/jboss-web.xml
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme/portal-layout.tld
   trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
Log:
JBPORTAL-1084: updated headers.

Modified: trunk/cms/build.xml
===================================================================
--- trunk/cms/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
@@ -84,8 +107,8 @@
          <path refid="sun.jaf.classpath"/>
          <path refid="xdoclet.xdoclet.classpath"/>
          <path refid="jcr.jcr.classpath"/>
-	     <!-- cms optimization integration -->
-	     <path refid="jgroups.jgroups.classpath"/>
+         <!-- cms optimization integration -->
+         <path refid="jgroups.jgroups.classpath"/>
 		 <path refid="sun.servlet.classpath"/>
       </path>
       
@@ -103,9 +126,9 @@
          <path refid="jboss.portal-server.classpath"/>
          <path refid="jboss.portal-common.classpath"/>		 
          <path refid="jboss.portal-jems.classpath"/>
-         <path refid="jboss.portal-test.classpath"/>	
-	     <!-- clustered testcases related -->
-	     <path refid="jboss.portal-portlet.classpath"/>
+         <path refid="jboss.portal-test.classpath"/>
+         <!-- clustered testcases related -->
+         <path refid="jboss.portal-portlet.classpath"/>
 		 <path refid="jboss.portlet-api.classpath"/>
       </path>
 
@@ -167,9 +190,9 @@
          <fileset dir="${jcr.jcr.root}/lib" includes="jcr-1.0.jar"/>
          <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/>
          <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
-	
-	  	<!-- cms optimization integration -->
-	    <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>	    
+
+         <!-- cms optimization integration -->
+         <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
 	  	<fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
 	  	<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>		 
 	     
@@ -183,29 +206,29 @@
          <fileset dir="${source.bin}" includes="headerpage_good.html"/>
       </copy>
    </target>
+
+   <!--
+             generates artifacts used for tests, requires output to be previously run
+    -->
+   <target name="package-tests" depends="init">
 	
-	<!-- 
-				generates artifacts used for tests, requires output to be previously run
-	-->
-	<target name="package-tests" depends="init">		 
-	
 		 <jar jarfile="${build.lib}/test-cms-cluster.sar" manifest="${build.etc}/portal-cms-lib-sar.mf">
 		         <fileset dir="${build.resources}/portal-cms-sar"/>
 		         <fileset dir="${build.lib}" includes="portal-cms-lib.jar"/>
 		         <fileset dir="${jcr.jcr.root}/lib" includes="jcr-1.0.jar"/>
 		         <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/>
 		         <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
-			
-				<!-- cms optimization integration -->
-		    	<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>	    
+
+          <!-- cms optimization integration -->
+          <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
 		  		<fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
 		  		<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>		 
 			     
 			
-		        <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>   
-		
-		        <!-- add the jboss-service.xml and hibernate configuration -->
-	   			<fileset dir="${build.resources}/test/cms/clustering/sar"/>   
+		        <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
+
+          <!-- add the jboss-service.xml and hibernate configuration -->
+          <fileset dir="${build.resources}/test/cms/clustering/sar"/>
 	   			<fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/>			
 	   	   		<fileset dir="${jboss.portal-common.lib}" includes="portal-common-lib.jar"/>
 	   			<fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/>   						
@@ -219,21 +242,21 @@
 	</target>
 	
 	<target name="deploy-tests"
-	           description="Deploy."
-	           depends="output">
+           description="Deploy."
+           depends="output">
 		  <!-- 
 		  		upgrage the jbosscache/groups of the HA instances for the puropse of testing
 		  		
 		  		TODO: This is fine for this iteration. Eventually we need to integrate these libraries
 		    	for bundling in the thirdparty mechanism. This will follow in the next iteration
 		   -->
-      	  <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/ports-01/lib" overwrite="true"/>
+      <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/ports-01/lib" overwrite="true"/>
       	  <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/ports-01/lib" overwrite="true"/>
 		  <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/ports-02/lib" overwrite="true"/>
 	      <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/ports-02/lib" overwrite="true"/>
-	
-	      <!-- install test sars needed for the testsuite framework -->
-		  <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
+
+      <!-- install test sars needed for the testsuite framework -->
+      <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
 	      <copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
 		  <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
 		  <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
@@ -243,11 +266,11 @@
 	</target>
 	
 	<target name="undeploy-tests"
-		           description="UnDeploy."
-		           depends="output">
+           description="UnDeploy."
+           depends="output">
 	
 		      <!-- install test sars needed for the testsuite framework -->
-			  <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
+      <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
 		      <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/>
 			  <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/>
 			  <delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/>		
@@ -328,12 +351,12 @@
 	            <pathelement location="${build.resources}/test"/>
 	            <pathelement location="${build.resources}/hibernate"/>
 	            <pathelement location="${jboss.portal-test.root}/etc"/>
-		        <!-- jbosscachepersistence manager integration -->
-				<path refid="jackrabbit.jackrabbit.classpath"/>
+               <!-- jbosscachepersistence manager integration -->
+               <path refid="jackrabbit.jackrabbit.classpath"/>
 		        <path refid="jboss.cache.classpath"/>
 				<path refid="jgroups.jgroups.classpath"/>
-	            <!-- for clustering related -->
-				<pathelement location="${source.java}"/>
+               <!-- for clustering related -->
+               <pathelement location="${source.java}"/>
 	            <pathelement location="${build.classes}"/>
 	            <pathelement location="${build.resources}"/>
 	            <path refid="library.classpath"/>
@@ -349,13 +372,13 @@
       <execute-tests>
          <x-test>	
 			<!-- general cms setup related tests -->
-	        <test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
 	        <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/>
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/>
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/>
-	
-	        <!-- cms file command tests -->      		
-      		<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreate"/>
+
+            <!-- cms file command tests -->
+            <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreate"/>
       		<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileUpdate"/>
       		<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileArchiveUpload"/>			
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGet"/>			
@@ -363,10 +386,10 @@
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetList"/>
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCopy"/>			
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/>
-			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/>			
-	
-	        <!-- cms folder command tests -->
-			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/>            
+			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/>
+
+            <!-- cms folder command tests -->
+            <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/>
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/>            
             <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/>            			
 			<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/>            			
@@ -405,8 +428,8 @@
             <pathelement location="${build.resources}/test"/>
             <pathelement location="${build.resources}/hibernate"/>
             <pathelement location="${jboss.portal-test.root}/etc"/>
-	        <!-- jbosscachepersistence manager integration -->
-			<path refid="jackrabbit.jackrabbit.classpath"/>
+            <!-- jbosscachepersistence manager integration -->
+            <path refid="jackrabbit.jackrabbit.classpath"/>
 			<path refid="jboss.cache.classpath"/>
 			<path refid="jgroups.jgroups.classpath"/>
          </x-classpath>

Modified: trunk/cms/src/main/org/jboss/portal/cms/CMS.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/CMS.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/CMS.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms;
 
 /**
@@ -28,18 +29,12 @@
  */
 public interface CMS
 {
-   /**
-    * Return the command factory.
-    */
+   /** Return the command factory. */
    CommandFactory getCommandFactory();
 
-   /**
-    * Execute the command.
-    */
+   /** Execute the command. */
    Object execute(Command cmd) throws CMSException;
 
-   /**
-    * Return default locale 
-    */
+   /** Return default locale */
    String getDefaultLocale();
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/CMSException.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/CMSException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/CMSException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms;
 
 /**

Modified: trunk/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/CMSInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms;
 
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
@@ -26,9 +27,7 @@
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.server.impl.invocation.JBossInterceptor;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public abstract class CMSInterceptor extends JBossInterceptor
 {
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/CMSMimeMappings.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms;
 
-import org.jboss.portal.common.util.XML;
 import org.jboss.portal.common.util.Tools;
-
+import org.jboss.portal.common.util.XML;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
-import java.io.InputStream;
 
 /**
- * @author <a href="mailto:palber at novell.com">Polina Alber</a>
- *         Date: Apr 30, 2005; Time: 2:10:44 AM
- * @since JBoss portal 2.0
- *        Class org.jboss.portal.setup.impl.dl.cmsloader.CMSMimeMappings
+ * @author <a href="mailto:palber at novell.com">Polina Alber</a> Date: Apr 30, 2005; Time: 2:10:44 AM
+ * @since JBoss portal 2.0 Class org.jboss.portal.setup.impl.dl.cmsloader.CMSMimeMappings
  */
 public class CMSMimeMappings
 {

Modified: trunk/cms/src/main/org/jboss/portal/cms/Command.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/Command.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/Command.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms;
 
 import org.jboss.portal.common.invocation.Invocation;

Modified: trunk/cms/src/main/org/jboss/portal/cms/CommandFactory.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/CommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/CommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms;
 
+import org.jboss.portal.cms.model.Content;
+import org.jboss.portal.cms.model.File;
+import org.jboss.portal.cms.model.Folder;
+
 import java.io.InputStream;
 import java.util.List;
 import java.util.Locale;
 
-import org.jboss.portal.cms.model.Content;
-import org.jboss.portal.cms.model.File;
-import org.jboss.portal.cms.model.Folder;
-
 /**
  * Factory to create commands for the cms service.
  *
@@ -38,9 +39,9 @@
 public interface CommandFactory
 {
    Command createNewFileCommand(File sFile, Content content);
-   
+
    Command createUpdateFileCommand(File sFile, Content content, boolean makeLive);
-   
+
    Command createCopyCommand(String sFromPath, String sToPath);
 
    Command createMoveCommand(String sFromPath, String sToPath);

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/CMSEntry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate;
 
 import java.io.Serializable;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class CMSEntry implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 8966981748397534807L;
-   
+
    private Integer key;
    private String path;
    private String name;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate;
 
+import org.apache.jackrabbit.core.fs.FileSystem;
+import org.apache.jackrabbit.core.fs.FileSystemException;
+import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
+import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
+import org.apache.jackrabbit.util.TransientFileFactory;
+import org.apache.log4j.Logger;
+import org.hibernate.Hibernate;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.jboss.portal.cms.util.HibernateUtil;
+import org.jboss.portal.common.util.Tools;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -31,30 +46,13 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
-import java.io.BufferedInputStream;
 import java.sql.Blob;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.jackrabbit.core.fs.FileSystem;
-import org.apache.jackrabbit.core.fs.FileSystemException;
-import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
-import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
-import org.apache.jackrabbit.util.TransientFileFactory;
-import org.apache.log4j.Logger;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.Hibernate;
-import org.jboss.portal.cms.util.HibernateUtil;
-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.jems.hibernate.CacheableBlobUserType;
-import org.jboss.portal.jems.hibernate.ByteArrayBlob;
-
 /**
- * This is a FileSystem store using Hibernate, built on the DBFilesystem class packaged with Apache Jackrabbit
- * that persists file system entries in a database table.
+ * This is a FileSystem store using Hibernate, built on the DBFilesystem class packaged with Apache Jackrabbit that
+ * persists file system entries in a database table.
  * <p/>
  * The required schema is created by hibernate using the portal datasource.
  * <p/>
@@ -100,9 +98,7 @@
    protected String deleteFolderStmt;
    protected String insertFileStmt;
 
-   /**
-    * Default constructor
-    */
+   /** Default constructor */
    public HibernateStore()
    {
       initialized = false;
@@ -130,7 +126,7 @@
 
    public void init() throws FileSystemException
    {
-      if(initialized)
+      if (initialized)
       {
          throw new IllegalStateException("already initialized");
       }
@@ -140,39 +136,39 @@
       selectExistStmt = "select 1 from " + schemaObjectPrefix + " where FSENTRY_PATH = ? " + "and FSENTRY_NAME = ?";
 
       insertFileStmt = "insert into "
-                       + schemaObjectPrefix + " (FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, "
-                       + "FSENTRY_LASTMOD, FSENTRY_LENGTH) "
-                       + "values (?, ?, ?, ?, ?)";
+         + schemaObjectPrefix + " (FSENTRY_PATH, FSENTRY_NAME, FSENTRY_DATA, "
+         + "FSENTRY_LASTMOD, FSENTRY_LENGTH) "
+         + "values (?, ?, ?, ?, ?)";
 
       selectFileExistStmt = "select 1 from "
-                            + schemaObjectPrefix + " where FSENTRY_PATH = ? "
-                            + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
+         + schemaObjectPrefix + " where FSENTRY_PATH = ? "
+         + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
 
       selectFolderExistStmt = "select 1 from "
-                              + schemaObjectPrefix + " where FSENTRY_PATH = ? "
-                              + "and FSENTRY_NAME = ? and FSENTRY_DATA is null";
+         + schemaObjectPrefix + " where FSENTRY_PATH = ? "
+         + "and FSENTRY_NAME = ? and FSENTRY_DATA is null";
 
       selectChildCountStmt = "select count(FSENTRY_NAME) from "
-                             + schemaObjectPrefix + " where FSENTRY_PATH = ?";
+         + schemaObjectPrefix + " where FSENTRY_PATH = ?";
 
       selectDataStmt = "select data from "
-                       + schemaObjectPrefix + " where FSENTRY_PATH = ? "
-                       + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
+         + schemaObjectPrefix + " where FSENTRY_PATH = ? "
+         + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
 
       selectLastModifiedStmt = "select FSENTRY_LASTMOD from "
-                               + schemaObjectPrefix + " where FSENTRY_PATH = ? "
-                               + "and FSENTRY_NAME = ?";
+         + schemaObjectPrefix + " where FSENTRY_PATH = ? "
+         + "and FSENTRY_NAME = ?";
 
       selectLengthStmt = "select FSENTRY_LENGTH from "
-                         + schemaObjectPrefix + " where FSENTRY_PATH = ? "
-                         + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
+         + schemaObjectPrefix + " where FSENTRY_PATH = ? "
+         + "and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
 
       initialized = true;
    }
 
    public void close() throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -181,19 +177,20 @@
 
    /**
     * Creates a folder and recursively all sub-folders in between
+    *
     * @param folderPath the path of the folder to create
     * @throws FileSystemException if the folder cannot be created or if the folder already exists
     */
    public void createFolder(String folderPath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
 
       FileSystemPathUtil.checkFormat(folderPath);
 
-      if(!exists(folderPath))
+      if (!exists(folderPath))
       {
          createDeepFolder(folderPath);
       }
@@ -208,7 +205,7 @@
     */
    public void deleteFile(String filePath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -227,48 +224,48 @@
          String query = "from " + schemaObjectPrefix + " where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null";
 
          List result = session.createQuery(query)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .list();
 
-         if(result.size() == 0)
+         if (result.size() == 0)
          {
             throw new FileSystemException("no such file: " + filePath);
          }
 
-         if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+         if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
          {
             Iterator iter = result.iterator();
-            while(iter.hasNext())
+            while (iter.hasNext())
             {
-               VersionEntry versionEntry = (VersionEntry) iter.next();
+               VersionEntry versionEntry = (VersionEntry)iter.next();
                session.delete(versionEntry);
             }
 
          }
-         else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+         else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
          {
             Iterator iter = result.iterator();
-            while(iter.hasNext())
+            while (iter.hasNext())
             {
-               CMSEntry cmsEntry = (CMSEntry) iter.next();
+               CMSEntry cmsEntry = (CMSEntry)iter.next();
                session.delete(cmsEntry);
             }
 
          }
-         else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+         else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
          {
             Iterator iter = result.iterator();
-            while(iter.hasNext())
+            while (iter.hasNext())
             {
-               RepositoryEntry repoEntry = (RepositoryEntry) iter.next();
+               RepositoryEntry repoEntry = (RepositoryEntry)iter.next();
                session.delete(repoEntry);
             }
 
          }
          tx.commit();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          tx.rollback();
          String msg = "failed to delete file: " + filePath;
@@ -298,14 +295,14 @@
     */
    public void deleteFolder(String folderPath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
 
       FileSystemPathUtil.checkFormat(folderPath);
 
-      if(folderPath.equals(FileSystem.SEPARATOR))
+      if (folderPath.equals(FileSystem.SEPARATOR))
       {
          throw new FileSystemException("cannot delete root");
       }
@@ -320,48 +317,48 @@
       {
 
          String query = "from " + schemaObjectPrefix + " where FSENTRY_PATH = ? and FSENTRY_NAME = ? " +
-                        "and FSENTRY_DATA is null or (FSENTRY_PATH = ?) or (FSENTRY_PATH like ?)";
+            "and FSENTRY_DATA is null or (FSENTRY_PATH = ?) or (FSENTRY_PATH like ?)";
 
          List result = session.createQuery(query)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .setString(2, folderPath)
-               .setString(3, folderPath + FileSystem.SEPARATOR + "%")
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .setString(2, folderPath)
+            .setString(3, folderPath + FileSystem.SEPARATOR + "%")
+            .list();
 
-         if(result.size() == 0)
+         if (result.size() == 0)
          {
             throw new FileSystemException("no such folder: " + folderPath);
          }
 
-         if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+         if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
          {
             Iterator iter = result.iterator();
-            while(iter.hasNext())
+            while (iter.hasNext())
             {
-               VersionEntry versionEntry = (VersionEntry) iter.next();
+               VersionEntry versionEntry = (VersionEntry)iter.next();
                session.delete(versionEntry);
 
             }
 
          }
-         else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+         else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
          {
             Iterator iter = result.iterator();
-            while(iter.hasNext())
+            while (iter.hasNext())
             {
-               CMSEntry cmsEntry = (CMSEntry) iter.next();
+               CMSEntry cmsEntry = (CMSEntry)iter.next();
                session.delete(cmsEntry);
 
             }
 
          }
-         else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+         else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
          {
             Iterator iter = result.iterator();
-            while(iter.hasNext())
+            while (iter.hasNext())
             {
-               RepositoryEntry repoEntry = (RepositoryEntry) iter.next();
+               RepositoryEntry repoEntry = (RepositoryEntry)iter.next();
                session.delete(repoEntry);
 
             }
@@ -369,7 +366,7 @@
          }
          tx.commit();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          tx.rollback();
          String msg = "failed to delete folder: " + folderPath;
@@ -387,7 +384,7 @@
     */
    public boolean exists(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -402,17 +399,17 @@
       try
       {
          List rs = session.createQuery(selectExistStmt)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .list();
 
          Iterator iter = rs.iterator();
-         if(iter.hasNext())
+         if (iter.hasNext())
          {
             return true;
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to check existence of file system entry: " + path;
          log.error(msg, e);
@@ -430,7 +427,7 @@
     */
    public boolean isFile(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -445,18 +442,18 @@
       try
       {
          List rs = session.createQuery(selectFileExistStmt)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .list();
 
          Iterator iter = rs.iterator();
-         if(iter.hasNext())
+         if (iter.hasNext())
          {
             return true;
          }
          return false;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to check existence of file: " + path;
          log.error(msg, e);
@@ -473,7 +470,7 @@
     */
    public boolean isFolder(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -488,18 +485,18 @@
       try
       {
          List rs = session.createQuery(selectFolderExistStmt)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .list();
 
          Iterator iter = rs.iterator();
-         if(iter.hasNext())
+         if (iter.hasNext())
          {
             return true;
          }
          return false;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to check existence of folder: " + path;
          log.error(msg, e);
@@ -516,7 +513,7 @@
     */
    public long lastModified(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -531,18 +528,18 @@
       try
       {
          List rs = session.createQuery(selectLastModifiedStmt)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .list();
 
-         if(rs.size() == 0)
+         if (rs.size() == 0)
          {
             throw new FileSystemException("no such file system entry: " + path);
          }
          Iterator iter = rs.iterator();
-         return ((Long) iter.next()).longValue();
+         return ((Long)iter.next()).longValue();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to determine lastModified of file system entry: " + path;
          log.error(msg, e);
@@ -559,7 +556,7 @@
     */
    public long length(String filePath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -574,18 +571,18 @@
       try
       {
          List rs = session.createQuery(selectLengthStmt)
-               .setString(0, parentDir)
-               .setString(1, name)
-               .list();
+            .setString(0, parentDir)
+            .setString(1, name)
+            .list();
 
-         if(rs.size() == 0)
+         if (rs.size() == 0)
          {
             throw new FileSystemException("no such file system entry: " + filePath);
          }
          Iterator iter = rs.iterator();
-         return ((Long) iter.next()).longValue();
+         return ((Long)iter.next()).longValue();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to determine length of file: " + filePath;
          log.error(msg, e);
@@ -602,14 +599,14 @@
     */
    public boolean hasChildren(String path) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
 
       FileSystemPathUtil.checkFormat(path);
 
-      if(!exists(path))
+      if (!exists(path))
       {
          throw new FileSystemException("no such file system entry: " + path);
       }
@@ -619,23 +616,23 @@
       try
       {
          List rs = session.createQuery(selectChildCountStmt)
-               .setString(0, path)
-               .list();
+            .setString(0, path)
+            .list();
 
-         if(rs.size() == 0)
+         if (rs.size() == 0)
          {
             return false;
          }
          Iterator iter = rs.iterator();
-         int count = ((Integer) iter.next()).intValue();
-         if(FileSystemPathUtil.denotesRoot(path))
+         int count = ((Integer)iter.next()).intValue();
+         if (FileSystemPathUtil.denotesRoot(path))
          {
             // ingore file system root entry
             count--;
          }
          return (count > 0);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to determine child count of file system entry: " + path;
          log.error(msg, e);
@@ -866,7 +863,7 @@
     */
    public InputStream getInputStream(String filePath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -882,22 +879,22 @@
       try
       {
          Query query = session.createQuery(selectDataStmt)
-               .setString(0, parentDir)
-               .setString(1, name);
+            .setString(0, parentDir)
+            .setString(1, name);
 
          List rs = query.list();
          //
          Iterator iter = rs.iterator();
-         java.sql.Blob blob = (java.sql.Blob) iter.next();
+         java.sql.Blob blob = (java.sql.Blob)iter.next();
          /*
          InputStream is = blob.getBinaryStream();
          Tools.safeClose(is);
          */
-         BlobInputStream blobIs =  new BlobInputStream(blob);
+         BlobInputStream blobIs = new BlobInputStream(blob);
          tx.commit();
          return blobIs;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          tx.rollback();
          String msg = "failed to retrieve data of file: " + filePath;
@@ -914,9 +911,9 @@
     *
     */
    public OutputStream getOutputStream(final String filePath)
-         throws FileSystemException
+      throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -926,12 +923,12 @@
       final String parentDir = FileSystemPathUtil.getParentDir(filePath);
       final String name = FileSystemPathUtil.getName(filePath);
 
-      if(!isFolder(parentDir))
+      if (!isFolder(parentDir))
       {
          throw new FileSystemException("path not found: " + parentDir);
       }
 
-      if(isFolder(filePath))
+      if (isFolder(filePath))
       {
          throw new FileSystemException("path denotes folder: " + filePath);
       }
@@ -952,7 +949,7 @@
                InputStream in = null;
                try
                {
-                  if(isFile(filePath))
+                  if (isFile(filePath))
                   {
                      // update
                      Session session = hibernateSessionFactory.openSession();
@@ -961,13 +958,13 @@
                      {
                         long length = f.length();
                         in = Tools.safeBufferedWrapper(new FileInputStream(f));
-                        if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+                        if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
                         {
                            Query query = session.createQuery("from VersionEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
                            query.setString(0, parentDir);
                            query.setString(1, name);
-                           VersionEntry versionEntry = (VersionEntry) query.uniqueResult();
-                           if(versionEntry == null)
+                           VersionEntry versionEntry = (VersionEntry)query.uniqueResult();
+                           if (versionEntry == null)
                            {
                               throw new Exception("No such Entry " + name);
                            }
@@ -978,13 +975,13 @@
 
                            session.save(versionEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
                         {
                            Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
                            query.setString(0, parentDir);
                            query.setString(1, name);
-                           CMSEntry cmsEntry = (CMSEntry) query.uniqueResult();
-                           if(cmsEntry == null)
+                           CMSEntry cmsEntry = (CMSEntry)query.uniqueResult();
+                           if (cmsEntry == null)
                            {
                               throw new Exception("No such Entry " + name);
                            }
@@ -995,13 +992,13 @@
 
                            session.save(cmsEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
                         {
                            Query query = session.createQuery("from RepositoryEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
                            query.setString(0, parentDir);
                            query.setString(1, name);
-                           RepositoryEntry repoEntry = (RepositoryEntry) query.uniqueResult();
-                           if(repoEntry == null)
+                           RepositoryEntry repoEntry = (RepositoryEntry)query.uniqueResult();
+                           if (repoEntry == null)
                            {
                               throw new Exception("No such Entry " + name);
                            }
@@ -1015,7 +1012,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to update existing file: " + filePath;
@@ -1035,17 +1032,17 @@
                      {
                         long length = f.length();
                         in = new FileInputStream(f);
-                        if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+                        if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
                         {
                            VersionEntry versionEntry = new VersionEntry(parentDir, name, createBlob(in), System.currentTimeMillis(), length);
                            session.save(versionEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
                         {
                            CMSEntry cmsEntry = new CMSEntry(parentDir, name, createBlob(in), System.currentTimeMillis(), length);
                            session.save(cmsEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
                         {
                            RepositoryEntry repoEntry = new RepositoryEntry(parentDir, name, createBlob(in), System.currentTimeMillis(), length);
                            session.save(repoEntry);
@@ -1053,7 +1050,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to create new file: " + filePath;
@@ -1066,7 +1063,7 @@
                      }
                   }
                }
-               catch(Exception e)
+               catch (Exception e)
                {
                   throw new IOException(e.getMessage());
                }
@@ -1080,7 +1077,7 @@
             }
          };
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to open output strean to file: " + filePath;
          log.error(msg, e);
@@ -1099,9 +1096,9 @@
     *
     */
    public RandomAccessOutputStream getRandomAccessOutputStream(final String filePath)
-         throws FileSystemException, UnsupportedOperationException
+      throws FileSystemException, UnsupportedOperationException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -1111,12 +1108,12 @@
       final String parentDir = FileSystemPathUtil.getParentDir(filePath);
       final String name = FileSystemPathUtil.getName(filePath);
 
-      if(!isFolder(parentDir))
+      if (!isFolder(parentDir))
       {
          throw new FileSystemException("path not found: " + parentDir);
       }
 
-      if(isFolder(filePath))
+      if (isFolder(filePath))
       {
          throw new FileSystemException("path denotes folder: " + filePath);
       }
@@ -1128,7 +1125,7 @@
 
 // @todo FIXME use java.sql.Blob
 
-         if(isFile(filePath))
+         if (isFile(filePath))
          {
             // file entry exists, spool contents to temp file first
             InputStream in = getInputStream(filePath);
@@ -1137,7 +1134,7 @@
             {
                int read;
                byte[] ba = new byte[8192];
-               while((read = in.read(ba, 0, ba.length)) != -1)
+               while ((read = in.read(ba, 0, ba.length)) != -1)
                {
                   out.write(ba, 0, read);
                }
@@ -1161,7 +1158,7 @@
                InputStream in = null;
                try
                {
-                  if(isFile(filePath))
+                  if (isFile(filePath))
                   {
                      // update
                      Session session = hibernateSessionFactory.openSession();
@@ -1170,13 +1167,13 @@
                      {
                         long length = f.length();
                         in = Tools.safeBufferedWrapper(new FileInputStream(f));
-                        if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+                        if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
                         {
                            Query query = session.createQuery("from VersionEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
                            query.setString(0, parentDir);
                            query.setString(1, name);
-                           VersionEntry versionEntry = (VersionEntry) query.uniqueResult();
-                           if(versionEntry == null)
+                           VersionEntry versionEntry = (VersionEntry)query.uniqueResult();
+                           if (versionEntry == null)
                            {
                               throw new Exception("No such Entry " + name);
                            }
@@ -1187,13 +1184,13 @@
 
                            session.save(versionEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
                         {
                            Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
                            query.setString(0, parentDir);
                            query.setString(1, name);
-                           CMSEntry cmsEntry = (CMSEntry) query.uniqueResult();
-                           if(cmsEntry == null)
+                           CMSEntry cmsEntry = (CMSEntry)query.uniqueResult();
+                           if (cmsEntry == null)
                            {
                               throw new Exception("No such Entry " + name);
                            }
@@ -1204,13 +1201,13 @@
 
                            session.save(cmsEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
                         {
                            Query query = session.createQuery("from CMSEntry where FSENTRY_PATH = ? and FSENTRY_NAME = ? and FSENTRY_DATA is not null");
                            query.setString(0, parentDir);
                            query.setString(1, name);
-                           RepositoryEntry repoEntry = (RepositoryEntry) query.uniqueResult();
-                           if(repoEntry == null)
+                           RepositoryEntry repoEntry = (RepositoryEntry)query.uniqueResult();
+                           if (repoEntry == null)
                            {
                               throw new Exception("No such Entry " + name);
                            }
@@ -1224,7 +1221,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to update existing file: " + filePath;
@@ -1244,17 +1241,17 @@
                      {
                         long length = f.length();
                         in = Tools.safeBufferedWrapper(new FileInputStream(f));
-                        if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+                        if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
                         {
                            VersionEntry versionEntry = new VersionEntry(parentDir, name, createBlob(in), System.currentTimeMillis(), length);
                            session.save(versionEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
                         {
                            CMSEntry cmsEntry = new CMSEntry(parentDir, name, createBlob(in), System.currentTimeMillis(), length);
                            session.save(cmsEntry);
                         }
-                        else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+                        else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
                         {
                            RepositoryEntry repoEntry = new RepositoryEntry(parentDir, name, createBlob(in), System.currentTimeMillis(), length);
                            session.save(repoEntry);
@@ -1262,7 +1259,7 @@
                         session.flush();
                         tx.commit();
                      }
-                     catch(Exception e)
+                     catch (Exception e)
                      {
                         tx.rollback();
                         String msg = "failed to create new file: " + filePath;
@@ -1275,7 +1272,7 @@
                      }
                   }
                }
-               catch(Exception e)
+               catch (Exception e)
                {
                   throw new IOException(e.getMessage());
                }
@@ -1315,7 +1312,7 @@
             }
          };
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to open output strean to file: " + filePath;
          log.error(msg, e);
@@ -1328,7 +1325,7 @@
     */
    public void copy(String srcPath, String destPath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -1336,7 +1333,7 @@
       FileSystemPathUtil.checkFormat(srcPath);
       FileSystemPathUtil.checkFormat(destPath);
 
-      if(isFolder(srcPath))
+      if (isFolder(srcPath))
       {
          // src is a folder
          copyDeepFolder(srcPath, destPath);
@@ -1353,7 +1350,7 @@
     */
    public void move(String srcPath, String destPath) throws FileSystemException
    {
-      if(!initialized)
+      if (!initialized)
       {
          throw new IllegalStateException("not initialized");
       }
@@ -1363,7 +1360,7 @@
 
 // @todo optimize move (use sql update stmts)
       copy(srcPath, destPath);
-      if(isFile(srcPath))
+      if (isFile(srcPath))
       {
          deleteFile(srcPath);
       }
@@ -1376,8 +1373,7 @@
 //-------------------------------------------------< misc. helper methods >
 
    /**
-    * Checks if the required schema objects exist and creates them if they
-    * don't exist yet.
+    * Checks if the required schema objects exist and creates them if they don't exist yet.
     *
     * @throws Exception if an error occurs
     */
@@ -1441,8 +1437,7 @@
    }
 
    /**
-    * Verifies that the root file system entry exists. If it doesn't exist yet
-    * it will be automatically created.
+    * Verifies that the root file system entry exists. If it doesn't exist yet it will be automatically created.
     *
     * @throws Exception if an error occurs
     */
@@ -1453,17 +1448,17 @@
       try
       {
          List rs = session.createQuery(selectFolderExistStmt)
-               .setString(1, FileSystem.SEPARATOR)
-               .setString(2, "")
-               .list();
+            .setString(1, FileSystem.SEPARATOR)
+            .setString(2, "")
+            .list();
 
          Iterator iter = rs.iterator();
-         if(iter.hasNext())
+         if (iter.hasNext())
          {
             return;
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          String msg = "failed to check existence of file system root entry";
          log.error(msg, e);
@@ -1479,21 +1474,21 @@
    }
 
    /**
-    * Creates the specified files system folder entry, recursively creating
-    * any non-existing intermediate folder entries.
+    * Creates the specified files system folder entry, recursively creating any non-existing intermediate folder
+    * entries.
     *
     * @param folderPath folder entry to create
     * @throws FileSystemException if an error occurs
     */
    protected void createDeepFolder(String folderPath)
-         throws FileSystemException
+      throws FileSystemException
    {
       String parentDir = FileSystemPathUtil.getParentDir(folderPath);
       String name = FileSystemPathUtil.getName(folderPath);
 
-      if(!FileSystemPathUtil.denotesRoot(folderPath))
+      if (!FileSystemPathUtil.denotesRoot(folderPath))
       {
-         if(!exists(parentDir))
+         if (!exists(parentDir))
          {
             createDeepFolder(parentDir);
          }
@@ -1503,19 +1498,19 @@
       Transaction tx = session.beginTransaction();
       try
       {
-         if(schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
+         if (schemaObjectPrefix.equals(HibernateStoreConstants.versionClassName))
          {
 
             VersionEntry versionEntry = new VersionEntry(parentDir, name, null, System.currentTimeMillis(), 0);
             session.save(versionEntry);
          }
-         else if(schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
+         else if (schemaObjectPrefix.equals(HibernateStoreConstants.cmsClassName))
          {
 
             CMSEntry cmsEntry = new CMSEntry(parentDir, name, null, System.currentTimeMillis(), 0);
             session.save(cmsEntry);
          }
-         else if(schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
+         else if (schemaObjectPrefix.equals(HibernateStoreConstants.repositoryClassName))
          {
 
             RepositoryEntry repoEntry = new RepositoryEntry(parentDir, name, null, System.currentTimeMillis(), 0);
@@ -1524,7 +1519,7 @@
          session.flush();
          tx.commit();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          tx.rollback();
          String msg = "failed to create folder entry: " + folderPath;
@@ -1545,7 +1540,7 @@
     * @throws FileSystemException if an error occurs
     */
    protected void copyDeepFolder(String srcPath, String destPath)
-         throws FileSystemException
+      throws FileSystemException
    {
       throw new RuntimeException("Not Yet Implemented");
 /*
@@ -1589,17 +1584,16 @@
    }
 
    /**
-    * Copies the given file entry to the given destination path. The parent
-    * folder of the destination path will be created if it doesn't exist
-    * already. If the destination path refers to an existing file, the file
-    * will be overwritten.
+    * Copies the given file entry to the given destination path. The parent folder of the destination path will be
+    * created if it doesn't exist already. If the destination path refers to an existing file, the file will be
+    * overwritten.
     *
     * @param srcPath  file to be copied
     * @param destPath destination path to which the file is to be copied
     * @throws FileSystemException if an error occurs
     */
    protected void copyFile(String srcPath, String destPath)
-         throws FileSystemException
+      throws FileSystemException
    {
       throw new RuntimeException("Not Yet Implemented");
 /*
@@ -1724,8 +1718,6 @@
       }
 
 
-
-
    }
 
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/HibernateStoreConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class HibernateStoreConstants
 {
    // Used in HibernateStore

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/RepositoryEntry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate;
 
 import java.io.Serializable;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class RepositoryEntry implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 8428814876834347136L;
-   
+
    private Integer key;
    private String path;
    private String name;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/VersionEntry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate;
 
 import java.io.Serializable;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class VersionEntry implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -8500299784492212650L;
-   
+
    private Integer key;
    private String path;
    private String name;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Base.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
@@ -28,58 +29,59 @@
  *
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
  */
-public abstract class Base implements Serializable 
+public abstract class Base implements Serializable
 {
-    /**
-     * 
-     */
-    private boolean persistCacheItem = true; //true by default...all items when placed in cache must be persisted to database by cacheloader by default
-    private Integer key = null;
-    
-    /**
-     * 
-     *
-     */
-    public Base()
-    {
-        
-    }
-    
-    //------cacheItem Persistence related methods------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     *
-     */
-    public void disableCacheItemPersistence()
-    {
-        this.persistCacheItem = false;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public boolean isPersistCacheItem()
-    {
-        return this.persistCacheItem;
-    }
-    
-    /**
-     * 
-     *
-     */
-    public void resetCacheItemPersistence()
-    {
-        this.persistCacheItem = true;
-    }
-    //-----------data access related methods-------------------------------------------------------------------------------------------------------------
-    public Integer getKey()
-    {
-       return key;
-    }
+   /**
+    *
+    */
+   private boolean persistCacheItem = true; //true by default...all items when placed in cache must be persisted to database by cacheloader by default
+   private Integer key = null;
 
-    public void setKey(Integer key)
-    {
-       this.key = key;
-    }
+   /**
+    *
+    *
+    */
+   public Base()
+   {
+
+   }
+
+   //------cacheItem Persistence related methods------------------------------------------------------------------------------------------------------
+   /**
+    *
+    *
+    */
+   public void disableCacheItemPersistence()
+   {
+      this.persistCacheItem = false;
+   }
+
+   /**
+    *
+    *
+    */
+   public boolean isPersistCacheItem()
+   {
+      return this.persistCacheItem;
+   }
+
+   /**
+    *
+    *
+    */
+   public void resetCacheItemPersistence()
+   {
+      this.persistCacheItem = true;
+   }
+
+   //-----------data access related methods-------------------------------------------------------------------------------------------------------------
+   public Integer getKey()
+   {
+      return key;
+   }
+
+   public void setKey(Integer key)
+   {
+      this.key = key;
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,27 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.sql.Blob;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jcr.PropertyType;
-
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.fs.FileSystem;
@@ -58,11 +49,17 @@
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.jboss.portal.cms.hibernate.HibernateStoreConstants;
-//import org.jboss.portal.cms.util.HibernateUtil;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.jems.hibernate.CacheableBlobUserType;
-import org.jboss.portal.jems.hibernate.ByteArrayBlob;
 
+import javax.jcr.PropertyType;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.sql.Blob;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -70,9 +67,7 @@
 public class HibernatePersistenceManager implements PersistenceManager
 {
 
-   /**
-    * Logger instance
-    */
+   /** Logger instance */
    private static Logger log = Logger.getLogger(HibernatePersistenceManager.class);
 
    protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE = "${schemaObjectPrefix}";
@@ -121,21 +116,13 @@
 
    protected String nodeBinValSelect;
 
-   /**
-    * file system where BLOB data is stored
-    * (if <code>externalBLOBs==true</code>)
-    */
+   /** file system where BLOB data is stored (if <code>externalBLOBs==true</code>) */
    protected FileSystem blobFS;
 
-   /**
-    * BLOBStore that manages BLOB data in the file system
-    * (if <code>externalBLOBs==true</code>)
-    */
+   /** BLOBStore that manages BLOB data in the file system (if <code>externalBLOBs==true</code>) */
    protected BLOBStore blobStore;
 
-   /**
-    * Creates a new <code>SimpleDbPersistenceManager</code> instance.
-    */
+   /** Creates a new <code>SimpleDbPersistenceManager</code> instance. */
    public HibernatePersistenceManager()
    {
       schemaObjectPrefix = "";
@@ -229,17 +216,13 @@
       }
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   /** {@inheritDoc} */
    public NodeState createNew(NodeId id)
    {
       return new NodeState(id, null, null, NodeState.STATUS_NEW, false);
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   /** {@inheritDoc} */
    public PropertyState createNew(PropertyId id)
    {
       return new PropertyState(id, PropertyState.STATUS_NEW, false);
@@ -320,46 +303,46 @@
       Iterator iter = changeLog.deletedStates();
       while (iter.hasNext())
       {
-         ItemState state = (ItemState) iter.next();
+         ItemState state = (ItemState)iter.next();
          if (state.isNode())
          {
-            destroy((NodeState) state);
+            destroy((NodeState)state);
          }
          else
          {
-            destroy((PropertyState) state);
+            destroy((PropertyState)state);
          }
       }
       iter = changeLog.addedStates();
       while (iter.hasNext())
       {
-         ItemState state = (ItemState) iter.next();
+         ItemState state = (ItemState)iter.next();
          if (state.isNode())
          {
-            store((NodeState) state);
+            store((NodeState)state);
          }
          else
          {
-            store((PropertyState) state);
+            store((PropertyState)state);
          }
       }
       iter = changeLog.modifiedStates();
       while (iter.hasNext())
       {
-         ItemState state = (ItemState) iter.next();
+         ItemState state = (ItemState)iter.next();
          if (state.isNode())
          {
-            update((NodeState) state);
+            update((NodeState)state);
          }
          else
          {
-            update((PropertyState) state);
+            update((PropertyState)state);
          }
       }
       iter = changeLog.modifiedRefs();
       while (iter.hasNext())
       {
-         NodeReferences refs = (NodeReferences) iter.next();
+         NodeReferences refs = (NodeReferences)iter.next();
          if (refs.hasReferences())
          {
             store(refs);
@@ -390,12 +373,12 @@
          List rs = session.createQuery(nodeStateSelectData).setString(0, id.toString()).list();
 
          Iterator iter = rs.iterator();
-         
+
          //java.sql.Blob blob = (java.sql.Blob) iter.next();
          //in = blob.getBinaryStream();
          byte[] data = (byte[])iter.next();
          in = new java.io.ByteArrayInputStream(data);
-         
+
          NodeState state = createNew(id);
          Serializer.deserialize(state, in);
          Tools.safeClose(in);
@@ -407,7 +390,7 @@
          tx.rollback();
          if (e instanceof NoSuchItemStateException)
          {
-            throw (NoSuchItemStateException) e;
+            throw(NoSuchItemStateException)e;
          }
          String msg = "failed to read node state: " + id;
          log.error(msg, e);
@@ -434,13 +417,13 @@
       {
          List rs = session.createQuery(propertyStateSelectData).setCacheable(true).setString(0, id.toString()).list();
          Iterator iter = rs.iterator();
-         
+
          //java.sql.Blob blob = (java.sql.Blob) iter.next();
          //in = blob.getBinaryStream();
          byte[] data = (byte[])iter.next();
          in = new java.io.ByteArrayInputStream(data);
-         
-         
+
+
          PropertyState state = createNew(id);
          Serializer.deserialize(state, in, blobStore);
          Tools.safeClose(in);
@@ -452,7 +435,7 @@
          tx.rollback();
          if (e instanceof NoSuchItemStateException)
          {
-            throw (NoSuchItemStateException) e;
+            throw(NoSuchItemStateException)e;
          }
          String msg = "failed to read property state: " + id.toString();
          log.error(msg, e);
@@ -485,9 +468,9 @@
          {
             throw new NoSuchItemStateException(targetId.toString());
          }
-         byte[] data = (byte[]) iter.next();         
+         byte[] data = (byte[])iter.next();
          in = new java.io.ByteArrayInputStream(data);
-         
+
          NodeReferences refs = new NodeReferences(targetId);
          Serializer.deserialize(refs, in);
          Tools.safeClose(in);
@@ -499,7 +482,7 @@
          tx.rollback();
          if (e instanceof NoSuchItemStateException)
          {
-            throw (NoSuchItemStateException) e;
+            throw(NoSuchItemStateException)e;
          }
          String msg = "failed to read references: " + targetId;
          log.error(msg, e);
@@ -527,13 +510,13 @@
          Serializer.serialize(state, out);
          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
          {
-            VersionNode versionNode = new VersionNode(state.getId().toString(),out.toByteArray());
+            VersionNode versionNode = new VersionNode(state.getId().toString(), out.toByteArray());
             session.save(versionNode);
          }
          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
          {
 
-            WSPNode wspNode = new WSPNode(state.getId().toString(),out.toByteArray());
+            WSPNode wspNode = new WSPNode(state.getId().toString(), out.toByteArray());
             session.save(wspNode);
          }
       }
@@ -580,14 +563,14 @@
          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
          {
 
-            VersionRefs versionRefs = new VersionRefs(refs.getTargetId().toString(),out
-                  .toByteArray());
+            VersionRefs versionRefs = new VersionRefs(refs.getTargetId().toString(), out
+               .toByteArray());
             session.save(versionRefs);
          }
          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
          {
 
-            WSPRefs wspRefs = new WSPRefs(refs.getTargetId().toString(),out.toByteArray());
+            WSPRefs wspRefs = new WSPRefs(refs.getTargetId().toString(), out.toByteArray());
             session.save(wspRefs);
          }
       }
@@ -613,11 +596,9 @@
 
    /**
     * <p/>
-    * This method uses shared <code>PreparedStatement</code>s which must
-    * be executed strictly sequentially. Because this method synchronizes on
-    * the persistence manager instance there is no need to synchronize on the
-    * shared statement. If the method would not be sychronized the shared
-    * statements would have to be synchronized.
+    * This method uses shared <code>PreparedStatement</code>s which must be executed strictly sequentially. Because this
+    * method synchronizes on the persistence manager instance there is no need to synchronize on the shared statement.
+    * If the method would not be sychronized the shared statements would have to be synchronized.
     */
    //   public synchronized void store(PropertyState state)
    private void store(PropertyState state) throws ItemStateException
@@ -637,12 +618,12 @@
 
          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
          {
-            VersionProp versionProp = new VersionProp(state.getId().toString(),out.toByteArray());
+            VersionProp versionProp = new VersionProp(state.getId().toString(), out.toByteArray());
             session.save(versionProp);
          }
          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
          {
-            WSPProp wspProp = new WSPProp(state.getId().toString(),out.toByteArray());
+            WSPProp wspProp = new WSPProp(state.getId().toString(), out.toByteArray());
             session.save(wspProp);
          }
       }
@@ -685,7 +666,7 @@
          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
          {
             query.setString(0, state.getId().toString());
-            VersionNode versionNode = (VersionNode) query.uniqueResult();
+            VersionNode versionNode = (VersionNode)query.uniqueResult();
             if (versionNode == null)
             {
                throw new Exception("No such Node: " + state.getId());
@@ -695,7 +676,7 @@
          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
          {
             query.setString(0, state.getId().toString());
-            WSPNode wspNode = (WSPNode) query.uniqueResult();
+            WSPNode wspNode = (WSPNode)query.uniqueResult();
             if (wspNode == null)
             {
                throw new Exception("No such Node: " + state.getId());
@@ -742,7 +723,7 @@
          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
          {
             query.setString(0, state.getId().toString());
-            VersionProp versionProp = (VersionProp) query.uniqueResult();
+            VersionProp versionProp = (VersionProp)query.uniqueResult();
             if (versionProp == null)
             {
                throw new Exception("No such Property: " + state.getId());
@@ -752,7 +733,7 @@
          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
          {
             query.setString(0, state.getId().toString());
-            WSPProp wspProp = (WSPProp) query.uniqueResult();
+            WSPProp wspProp = (WSPProp)query.uniqueResult();
             if (wspProp == null)
             {
                throw new Exception("No such Property: " + state.getId());
@@ -780,9 +761,7 @@
 
    }
 
-   /**
-    * This is called by store(Changelog) this should not be called anywhere else
-    */
+   /** This is called by store(Changelog) this should not be called anywhere else */
    private void destroy(NodeState state) throws ItemStateException
    {
       if (!initialized)
@@ -811,9 +790,7 @@
       }
    }
 
-   /**
-    * This is called by store(Changelog) this should not be called anywhere else
-    */
+   /** This is called by store(Changelog) this should not be called anywhere else */
    private void destroy(PropertyState state) throws ItemStateException
    {
       if (!initialized)
@@ -832,11 +809,11 @@
             {
                if (val.getType() == PropertyType.BINARY)
                {
-                  BLOBFileValue blobVal = (BLOBFileValue) val.internalValue();
+                  BLOBFileValue blobVal = (BLOBFileValue)val.internalValue();
                   // delete internal resource representation of BLOB value
                   blobVal.delete(true);
                   // also remove from BLOBStore
-                  String blobId = blobStore.createId((PropertyId) state.getId(), i);
+                  String blobId = blobStore.createId((PropertyId)state.getId(), i);
                   try
                   {
                      blobStore.remove(blobId);
@@ -856,7 +833,7 @@
       try
       {
          Query query = session.createQuery(propertyStateSelect).setCacheable(true).setString(0,
-               state.getId().toString());
+            state.getId().toString());
          Object result = query.uniqueResult();
          if (result != null)
          {
@@ -887,12 +864,12 @@
       try
       {
          Query query = session.createQuery(nodeReferenceSelect).setCacheable(true).setString(0,
-               refs.getTargetId().toString());                  
-         
+            refs.getTargetId().toString());
+
          List list = query.list();
-         if(list == null)
+         if (list == null)
          {
-             return;
+            return;
          }
          Object result = list.iterator().next();
          if (result != null)
@@ -1014,7 +991,7 @@
          {
             List rs = session.createQuery(blobSelectData).setCacheable(true).setString(0, blobId).list();
             Iterator iter = rs.iterator();
-            java.sql.Blob blob = (java.sql.Blob) iter.next();
+            java.sql.Blob blob = (java.sql.Blob)iter.next();
             InputStream is = blob.getBinaryStream();
             return is;
          }
@@ -1022,7 +999,7 @@
          {
             if (e instanceof NoSuchItemStateException)
             {
-               throw (NoSuchItemStateException) e;
+               throw(NoSuchItemStateException)e;
             }
             String msg = "failed to read binary data: " + blobId;
             log.error(msg, e);
@@ -1048,7 +1025,7 @@
                if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
                {
                   query.setString(0, blobId);
-                  VersionBinVal versionNode = (VersionBinVal) query.uniqueResult();
+                  VersionBinVal versionNode = (VersionBinVal)query.uniqueResult();
                   if (versionNode == null)
                   {
                      throw new Exception("No such Node: " + blobId);
@@ -1059,7 +1036,7 @@
                else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
                {
                   query.setString(0, blobId);
-                  WSPBinVal wspNode = (WSPBinVal) query.uniqueResult();
+                  WSPBinVal wspNode = (WSPBinVal)query.uniqueResult();
                   if (wspNode == null)
                   {
                      throw new Exception("No such Node: " + blobId);

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.sql.Blob;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jcr.PropertyType;
-import javax.management.MBeanServer;
-
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.fs.FileSystem;
@@ -54,1123 +43,1119 @@
 import org.apache.jackrabbit.core.value.BLOBFileValue;
 import org.apache.jackrabbit.core.value.InternalValue;
 import org.apache.log4j.Logger;
-
-import org.jboss.portal.cms.hibernate.HibernateStoreConstants;
-
+import org.hibernate.Hibernate;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.jboss.cache.CacheException;
 import org.jboss.cache.PropertyConfigurator;
 import org.jboss.cache.TreeCache;
 import org.jboss.cache.TreeCacheMBean;
-import org.jboss.cache.CacheException;
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.portal.cms.hibernate.HibernateStoreConstants;
 
-import org.hibernate.Hibernate;
-import org.hibernate.Query;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
+import javax.jcr.PropertyType;
+import javax.management.MBeanServer;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.sql.Blob;
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
 
 /*
  * Created on Aug 28, 2006
  *
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
  */
-public class JBossCachePersistenceManager implements PersistenceManager 
+public class JBossCachePersistenceManager implements PersistenceManager
 {
-    /**
-     * Logger instance
-     */
-    private static Logger log = Logger.getLogger(JBossCachePersistenceManager.class);
+   /** Logger instance */
+   private static Logger log = Logger.getLogger(JBossCachePersistenceManager.class);
 
-    protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE = "${schemaObjectPrefix}";
+   protected static final String SCHEMA_OBJECT_PREFIX_VARIABLE = "${schemaObjectPrefix}";
 
-    protected boolean initialized = false;
+   protected boolean initialized = false;
 
-    protected String jndiName = null;
+   protected String jndiName = null;
 
-    protected String schemaObjectPrefix = null;
+   protected String schemaObjectPrefix = null;
 
-    protected boolean externalBLOBs = false;
+   protected boolean externalBLOBs = false;
 
-    // initial size of buffer used to serialize objects
-    protected static final int INITIAL_BUFFER_SIZE = 1024;
-    
+   // initial size of buffer used to serialize objects
+   protected static final int INITIAL_BUFFER_SIZE = 1024;
 
-    // shared statements for BLOB management
-    // (if <code>externalBLOBs==false</code>)
-    protected String blobSelect = null;
 
-    protected String blobSelectData = null;
+   // shared statements for BLOB management
+   // (if <code>externalBLOBs==false</code>)
+   protected String blobSelect = null;
 
-    protected String blobSelectExist = null;
+   protected String blobSelectData = null;
 
-    protected String nodeBinValSelect = null;
+   protected String blobSelectExist = null;
 
-    /**
-     * file system where BLOB data is stored
-     * (if <code>externalBLOBs==true</code>)
-     */
-    protected FileSystem blobFS = null;
+   protected String nodeBinValSelect = null;
 
-    /**
-     * BLOBStore that manages BLOB data in the file system
-     * (if <code>externalBLOBs==true</code>)
-     */
-    protected BLOBStore blobStore = null;
+   /** file system where BLOB data is stored (if <code>externalBLOBs==true</code>) */
+   protected FileSystem blobFS = null;
 
-    /**
-     * 
-     */
-    private static TreeCacheMBean pmCache = null;
-    private static boolean preloaded = false;
-    
-    /**
-     * Creates a new <code>SimpleDbPersistenceManager</code> instance.
-     */
-    public JBossCachePersistenceManager()
-    {
-       schemaObjectPrefix = "";
-       externalBLOBs = true;
-       initialized = false;
-    }
-    
-    //------------------------------------------------------------------------------------------------------------------------------------------------
-    public String getJNDIName()
-    {
-       return jndiName;
-    }
+   /** BLOBStore that manages BLOB data in the file system (if <code>externalBLOBs==true</code>) */
+   protected BLOBStore blobStore = null;
 
-    public void setJNDIName(String JNDIName)
-    {
-       this.jndiName = JNDIName;
-    }
+   /**
+    *
+    */
+   private static TreeCacheMBean pmCache = null;
+   private static boolean preloaded = false;
 
-    public String getSchemaObjectPrefix()
-    {
-       return schemaObjectPrefix;
-    }
+   /** Creates a new <code>SimpleDbPersistenceManager</code> instance. */
+   public JBossCachePersistenceManager()
+   {
+      schemaObjectPrefix = "";
+      externalBLOBs = true;
+      initialized = false;
+   }
 
-    public void setSchemaObjectPrefix(String schemaObjectPrefix)
-    {
-       this.schemaObjectPrefix = schemaObjectPrefix;//.toUpperCase();
-    }
+   //------------------------------------------------------------------------------------------------------------------------------------------------
+   public String getJNDIName()
+   {
+      return jndiName;
+   }
 
-    public boolean isExternalBLOBs()
-    {
-       return externalBLOBs;
-    }
+   public void setJNDIName(String JNDIName)
+   {
+      this.jndiName = JNDIName;
+   }
 
-    public void setExternalBLOBs(boolean externalBLOBs)
-    {
-       this.externalBLOBs = externalBLOBs;
-    }
+   public String getSchemaObjectPrefix()
+   {
+      return schemaObjectPrefix;
+   }
 
-    public void setExternalBLOBs(String externalBLOBs)
-    {
-       this.externalBLOBs = Boolean.valueOf(externalBLOBs).booleanValue();
-    }
-    
-    
-    /* 
-     * 
-     */
-    public void init(PMContext context) throws Exception 
-    {
-        if (initialized)
-        {
-           throw new IllegalStateException("already initialized");
-        }     
+   public void setSchemaObjectPrefix(String schemaObjectPrefix)
+   {
+      this.schemaObjectPrefix = schemaObjectPrefix;//.toUpperCase();
+   }
 
-        nodeBinValSelect = "from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
+   public boolean isExternalBLOBs()
+   {
+      return externalBLOBs;
+   }
 
-        if (externalBLOBs)
-        {
-           /**
-            * store BLOBs in local file system in a sub directory
-            * of the workspace home directory
-            */
-           LocalFileSystem blobFS = new LocalFileSystem();
-           blobFS.setRoot(new File(context.getHomeDir(), "blobs"));
-           blobFS.init();
-           this.blobFS = blobFS;
-           blobStore = new FileSystemBLOBStore(blobFS);
-        }
-        else
-        {
-           /**
-            * store BLOBs in db
-            */
-           blobStore = new DbBLOBStore();
+   public void setExternalBLOBs(boolean externalBLOBs)
+   {
+      this.externalBLOBs = externalBLOBs;
+   }
 
-           blobSelect = "from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
-           blobSelectData = "select data from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
-           blobSelectExist = "select 1 from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
-        }
+   public void setExternalBLOBs(String externalBLOBs)
+   {
+      this.externalBLOBs = Boolean.valueOf(externalBLOBs).booleanValue();
+   }
 
-        initialized = true;
-        
-        try
-        { 
-           Tools.init(this.jndiName);           
-	       if(JBossCachePersistenceManager.pmCache == null)
-	       {
-	           try
-	           {	               
-	               MBeanServer server=MBeanServerLocator.locateJBoss();
-	               JBossCachePersistenceManager.pmCache = (TreeCacheMBean)MBeanProxyExt.create(TreeCacheMBean.class,"cms.pm.cache:service=TreeCache",server);	               
-	           }
-	           catch(Exception e)
-	           {
-	               JBossCachePersistenceManager.pmCache = null;
-	           }
-	           
-	           //try to load from specified configuration if any
-	           //if nothing found in the environment...chances are running in a non-managed environment
-	           if(JBossCachePersistenceManager.pmCache == null)
-	           {
-	               InputStream is = null;
-	               try
-	               {
-		                JBossCachePersistenceManager.pmCache = new TreeCache();
-					    
-					    //configure the cache
-					    PropertyConfigurator configurator = new PropertyConfigurator();
-					    is = JBossCachePersistenceManager.class.getClassLoader().getResourceAsStream("pm-cache.xml");
-					    configurator.configure(JBossCachePersistenceManager.pmCache,is);
-					    			    
-					    JBossCachePersistenceManager.pmCache.createService();
-					    JBossCachePersistenceManager.pmCache.startService();
-	               }
-	               finally
-	               {
-	                   if(is != null)
-	                   {
-	                       is.close();
-	                   }
-	               }
-	           }
-	       }
-	       
-	       //pre-load the cache with property nodes
-	       if(!JBossCachePersistenceManager.preloaded)
-	       {
-	           JBossCachePersistenceManager.loadProperties();	           
-	           log.info("-------------------------------------------------");
-	           log.info("JBossCachePersistenceManager is fully loaded.....");
-	           log.info("-------------------------------------------------");
-	       }
-        }
-        catch(Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }  
-        
-    /**
-     * 
-     *
-     */
-    private static synchronized void loadProperties() throws Exception
-    {
-        if(JBossCachePersistenceManager.preloaded)
-        {
-            return;
-        }
-        
-        log.info("Pre-loading the PersistenceManager Cache in the background (started).......");        
-        
-        CacheLoader wspProp = new CacheLoader(CacheLoader.wspProp,PortalCMSCacheLoader.WSP_PROP_NODE);
-        Thread wspPropLoader = new Thread(wspProp);
-        CacheLoader versionProp = new CacheLoader(CacheLoader.versionProp,PortalCMSCacheLoader.VERSION_PROP_NODE);
-        Thread versionPropLoader = new Thread(versionProp);
-        CacheLoader wspNode = new CacheLoader(CacheLoader.wspNode,PortalCMSCacheLoader.WSP_NODE_NODE);
-        Thread wspNodeLoader = new Thread(wspNode);
-        CacheLoader versionNode = new CacheLoader(CacheLoader.versionNode,PortalCMSCacheLoader.VERSION_NODE_NODE);
-        Thread versionNodeLoader = new Thread(versionNode);
-        CacheLoader wspRef = new CacheLoader(CacheLoader.wspRef,PortalCMSCacheLoader.WSP_REF_NODE);
-        Thread wspRefLoader = new Thread(wspRef);
-        CacheLoader versionRef = new CacheLoader(CacheLoader.versionRef,PortalCMSCacheLoader.VERSION_REF_NODE);
-        Thread versionRefLoader = new Thread(versionRef);
-        
-        wspPropLoader.start();
-        versionPropLoader.start();
-        wspNodeLoader.start();
-        versionNodeLoader.start();
-        wspRefLoader.start();
-        versionRefLoader.start();
-        
-        //hang out here till the cache loader threads have pre-loaded the busy nodes
-        //of the CMS...don't allow the usage of CMS till this operation is completed.
-        while(
-                !wspProp.done	||
-                !versionProp.done ||
-                !wspNode.done ||
-                !versionNode.done ||
-                !wspRef.done ||
-                !versionRef.done
-        )
-        {
-            Thread.currentThread().sleep((long)2000);
-        }
-        
-        JBossCachePersistenceManager.preloaded = true;                
-    }
-    
-    private static class CacheLoader implements Runnable
-    {
-        /**
-         * 
-         */
-        private static final String wspProp = "from org.jboss.portal.cms.hibernate.state.WSPProp";
-        private static final String versionProp = "from org.jboss.portal.cms.hibernate.state.VersionProp";
-        private static final String wspNode = "from org.jboss.portal.cms.hibernate.state.WSPNode";
-        private static final String versionNode = "from org.jboss.portal.cms.hibernate.state.VersionNode";
-        private static final String wspRef = "from org.jboss.portal.cms.hibernate.state.WSPRefs";
-        private static final String versionRef = "from org.jboss.portal.cms.hibernate.state.VersionRefs";
-        
-        
-        /**
-         * 
-         */
-        private String nodeQuery = null;
-        private String nodePrefix = null;
-        private boolean done = false;
-        
-        private CacheLoader(String nodeQuery,String nodePrefix)
-        {
-           this.nodeQuery = nodeQuery;
-           this.nodePrefix = nodePrefix;
-        }
-                        
-        public void run()
-        {                                    
+
+   /*
+   *
+   */
+   public void init(PMContext context) throws Exception
+   {
+      if (initialized)
+      {
+         throw new IllegalStateException("already initialized");
+      }
+
+      nodeBinValSelect = "from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
+
+      if (externalBLOBs)
+      {
+         /**
+          * store BLOBs in local file system in a sub directory
+          * of the workspace home directory
+          */
+         LocalFileSystem blobFS = new LocalFileSystem();
+         blobFS.setRoot(new File(context.getHomeDir(), "blobs"));
+         blobFS.init();
+         this.blobFS = blobFS;
+         blobStore = new FileSystemBLOBStore(blobFS);
+      }
+      else
+      {
+         /**
+          * store BLOBs in db
+          */
+         blobStore = new DbBLOBStore();
+
+         blobSelect = "from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
+         blobSelectData = "select data from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
+         blobSelectExist = "select 1 from " + schemaObjectPrefix + "BinVal where BINVAL_ID = ?";
+      }
+
+      initialized = true;
+
+      try
+      {
+         Tools.init(this.jndiName);
+         if (JBossCachePersistenceManager.pmCache == null)
+         {
+            try
+            {
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               JBossCachePersistenceManager.pmCache = (TreeCacheMBean)MBeanProxyExt.create(TreeCacheMBean.class, "cms.pm.cache:service=TreeCache", server);
+            }
+            catch (Exception e)
+            {
+               JBossCachePersistenceManager.pmCache = null;
+            }
+
+            //try to load from specified configuration if any
+            //if nothing found in the environment...chances are running in a non-managed environment
+            if (JBossCachePersistenceManager.pmCache == null)
+            {
+               InputStream is = null;
+               try
+               {
+                  JBossCachePersistenceManager.pmCache = new TreeCache();
+
+                  //configure the cache
+                  PropertyConfigurator configurator = new PropertyConfigurator();
+                  is = JBossCachePersistenceManager.class.getClassLoader().getResourceAsStream("pm-cache.xml");
+                  configurator.configure(JBossCachePersistenceManager.pmCache, is);
+
+                  JBossCachePersistenceManager.pmCache.createService();
+                  JBossCachePersistenceManager.pmCache.startService();
+               }
+               finally
+               {
+                  if (is != null)
+                  {
+                     is.close();
+                  }
+               }
+            }
+         }
+
+         //pre-load the cache with property nodes
+         if (!JBossCachePersistenceManager.preloaded)
+         {
+            JBossCachePersistenceManager.loadProperties();
+            log.info("-------------------------------------------------");
+            log.info("JBossCachePersistenceManager is fully loaded.....");
+            log.info("-------------------------------------------------");
+         }
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   /**
+    *
+    *
+    */
+   private static synchronized void loadProperties() throws Exception
+   {
+      if (JBossCachePersistenceManager.preloaded)
+      {
+         return;
+      }
+
+      log.info("Pre-loading the PersistenceManager Cache in the background (started).......");
+
+      CacheLoader wspProp = new CacheLoader(CacheLoader.wspProp, PortalCMSCacheLoader.WSP_PROP_NODE);
+      Thread wspPropLoader = new Thread(wspProp);
+      CacheLoader versionProp = new CacheLoader(CacheLoader.versionProp, PortalCMSCacheLoader.VERSION_PROP_NODE);
+      Thread versionPropLoader = new Thread(versionProp);
+      CacheLoader wspNode = new CacheLoader(CacheLoader.wspNode, PortalCMSCacheLoader.WSP_NODE_NODE);
+      Thread wspNodeLoader = new Thread(wspNode);
+      CacheLoader versionNode = new CacheLoader(CacheLoader.versionNode, PortalCMSCacheLoader.VERSION_NODE_NODE);
+      Thread versionNodeLoader = new Thread(versionNode);
+      CacheLoader wspRef = new CacheLoader(CacheLoader.wspRef, PortalCMSCacheLoader.WSP_REF_NODE);
+      Thread wspRefLoader = new Thread(wspRef);
+      CacheLoader versionRef = new CacheLoader(CacheLoader.versionRef, PortalCMSCacheLoader.VERSION_REF_NODE);
+      Thread versionRefLoader = new Thread(versionRef);
+
+      wspPropLoader.start();
+      versionPropLoader.start();
+      wspNodeLoader.start();
+      versionNodeLoader.start();
+      wspRefLoader.start();
+      versionRefLoader.start();
+
+      //hang out here till the cache loader threads have pre-loaded the busy nodes
+      //of the CMS...don't allow the usage of CMS till this operation is completed.
+      while (
+         !wspProp.done ||
+            !versionProp.done ||
+            !wspNode.done ||
+            !versionNode.done ||
+            !wspRef.done ||
+            !versionRef.done
+         )
+      {
+         Thread.currentThread().sleep((long)2000);
+      }
+
+      JBossCachePersistenceManager.preloaded = true;
+   }
+
+   private static class CacheLoader implements Runnable
+   {
+      /**
+       *
+       */
+      private static final String wspProp = "from org.jboss.portal.cms.hibernate.state.WSPProp";
+      private static final String versionProp = "from org.jboss.portal.cms.hibernate.state.VersionProp";
+      private static final String wspNode = "from org.jboss.portal.cms.hibernate.state.WSPNode";
+      private static final String versionNode = "from org.jboss.portal.cms.hibernate.state.VersionNode";
+      private static final String wspRef = "from org.jboss.portal.cms.hibernate.state.WSPRefs";
+      private static final String versionRef = "from org.jboss.portal.cms.hibernate.state.VersionRefs";
+
+
+      /**
+       *
+       */
+      private String nodeQuery = null;
+      private String nodePrefix = null;
+      private boolean done = false;
+
+      private CacheLoader(String nodeQuery, String nodePrefix)
+      {
+         this.nodeQuery = nodeQuery;
+         this.nodePrefix = nodePrefix;
+      }
+
+      public void run()
+      {
+         Session session = null;
+         try
+         {
+            session = Tools.getOpenSession();
+            List rs = session.createQuery(this.nodeQuery).list();
+            if (rs != null)
+            {
+               for (Iterator itr = rs.iterator(); itr.hasNext();)
+               {
+                  Base cour = (Base)itr.next();
+                  cour.disableCacheItemPersistence();
+
+                  if (cour instanceof WSPProp)
+                  {
+                     String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((WSPProp)cour).getPropId());
+                     pmCache.put(node, ((WSPProp)cour).getPropId(), cour);
+                  }
+                  else if (cour instanceof VersionProp)
+                  {
+                     String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((VersionProp)cour).getPropId());
+                     pmCache.put(node, ((VersionProp)cour).getPropId(), cour);
+                  }
+                  else if (cour instanceof WSPNode)
+                  {
+                     String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((WSPNode)cour).getNodeId());
+                     pmCache.put(node, ((WSPNode)cour).getNodeId(), cour);
+                  }
+                  else if (cour instanceof VersionNode)
+                  {
+                     String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((VersionNode)cour).getNodeId());
+                     pmCache.put(node, ((VersionNode)cour).getNodeId(), cour);
+                  }
+                  else if (cour instanceof WSPRefs)
+                  {
+                     String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((WSPRefs)cour).getRefId());
+                     pmCache.put(node, ((WSPRefs)cour).getRefId(), cour);
+                  }
+                  else if (cour instanceof VersionRefs)
+                  {
+                     String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((VersionRefs)cour).getRefId());
+                     pmCache.put(node, ((VersionRefs)cour).getRefId(), cour);
+                  }
+               }
+            }
+            log.info("Pre-loading the PersistenceManager Cache for" + this.nodePrefix + " (finished).......");
+         }
+         catch (CacheException ce)
+         {
+            throw new RuntimeException(ce);
+         }
+         finally
+         {
+            Tools.closeSession(session);
+            this.done = true;
+         }
+      }
+   }
+
+   //----------actions for node entities-------------------------------------------------------------------------------------------------------------
+   /*
+   *
+   */
+   public boolean exists(NodeId node) throws ItemStateException
+   {
+      try
+      {
+         boolean exists = false;
+         String nodeId = node.toString();
+         if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            if (o != null)
+            {
+               if (o instanceof WSPNode)
+               {
+                  exists = true;
+               }
+            }
+            else
+            {
+               this.pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, new Boolean(false));
+            }
+         }
+         else if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            if (o != null)
+            {
+               if (o instanceof VersionNode)
+               {
+                  exists = true;
+               }
+            }
+            else
+            {
+               this.pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, new Boolean(false));
+            }
+         }
+         return exists;
+      }
+      catch (CacheException ce)
+      {
+         throw new RuntimeException(ce);
+      }
+   }
+
+   /*
+   *
+   */
+   public NodeState load(NodeId node) throws NoSuchItemStateException, ItemStateException
+   {
+      try
+      {
+         NodeState nodeState = null;
+         String nodeId = node.toString();
+
+         //get the nodeData
+         byte[] nodeData = null;
+         if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            nodeData = ((WSPNode)o).getData();
+         }
+         else if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            nodeData = ((VersionNode)o).getData();
+         }
+
+         //parse propertyData into propertyState
+         if (nodeData != null)
+         {
             Session session = null;
+            Transaction tx = null;
+            boolean success = false;
             try
             {
-                session = Tools.getOpenSession();  
-                List rs = session.createQuery(this.nodeQuery).list();                                
-                if(rs != null)
-                {
-    	            for(Iterator itr=rs.iterator();itr.hasNext();)
-    	            {
-    	                Base cour = (Base)itr.next();
-    	                cour.disableCacheItemPersistence();
-    	                
-    	                if(cour instanceof WSPProp)
-    	                {    	                    
-    	                    String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((WSPProp)cour).getPropId());    	                    
-    	                    pmCache.put(node,((WSPProp)cour).getPropId(),cour);
-    	                }
-    	                else if(cour instanceof VersionProp)
-    	                {    	                    
-    	                    String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((VersionProp)cour).getPropId());
-    	                    pmCache.put(node,((VersionProp)cour).getPropId(),cour);
-    	                }
-    	                else if(cour instanceof WSPNode)
-    	                {    	                    
-    	                    String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((WSPNode)cour).getNodeId());
-    	                    pmCache.put(node,((WSPNode)cour).getNodeId(),cour);
-    	                }
-    	                else if(cour instanceof VersionNode)
-    	                {    	                    
-    	                    String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((VersionNode)cour).getNodeId());
-    	                    pmCache.put(node,((VersionNode)cour).getNodeId(),cour);
-    	                }
-    	                else if(cour instanceof WSPRefs)
-    	                {    	                    
-    	                    String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((WSPRefs)cour).getRefId());
-    	                    pmCache.put(node,((WSPRefs)cour).getRefId(),cour);
-    	                }
-    	                else if(cour instanceof VersionRefs)
-    	                {    	                    
-    	                    String node = this.nodePrefix + "/" + PortalCMSCacheLoader.parseNodeName(((VersionRefs)cour).getRefId());
-    	                    pmCache.put(node,((VersionRefs)cour).getRefId(),cour);
-    	                }
-    	            }
-                }                                
-                log.info("Pre-loading the PersistenceManager Cache for"+this.nodePrefix+" (finished).......");
+               session = Tools.getOpenSession();
+               tx = session.beginTransaction();
+
+               InputStream in = new ByteArrayInputStream(nodeData);
+
+               //setup the propertyState
+               nodeState = createNew(node);
+               Serializer.deserialize(nodeState, in);
+               org.jboss.portal.common.util.Tools.safeClose(in);
+
+               tx.commit();
+               success = true;
             }
-            catch(CacheException ce)
+            catch (Exception e)
             {
-                throw new RuntimeException(ce);
+               if (e instanceof NoSuchItemStateException)
+               {
+                  throw(NoSuchItemStateException)e;
+               }
+               String msg = "failed to read node state from cache: " + node.toString();
+               log.error(msg, e);
+               throw new ItemStateException(msg, e);
             }
             finally
             {
-                Tools.closeSession(session);
-                this.done = true;
+               if (!success)
+               {
+                  tx.rollback();
+               }
+               Tools.closeSession(session);
             }
-        }
-    }
-    
-    //----------actions for node entities-------------------------------------------------------------------------------------------------------------
-    /* 
-     * 
-     */
-    public boolean exists(NodeId node) throws ItemStateException 
-    {
-        try
-        {
-	        boolean exists = false;
-	        String nodeId = node.toString();
-	        if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            if(o != null)
-	            {
-	                if(o instanceof WSPNode)
-	                {
-	                    exists = true;
-	                }
-	            }
-	            else
-	            {
-	                this.pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId,new Boolean(false));
-	            }
-	        }
-	        else if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            if(o != null)
-	            {
-	                if(o instanceof VersionNode)
-	                {
-	                    exists = true;
-	                }
-	            }
-	            else
-	            {
-	                this.pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId,new Boolean(false));
-	            }
-	        }
-	        return exists;
-        }
-        catch(CacheException ce)
-        {
-            throw new RuntimeException(ce);
-        }
-    }
-    
-    /* 
-     * 
-     */
-    public NodeState load(NodeId node) throws NoSuchItemStateException,ItemStateException 
-    {
-        try
-        {
-	        NodeState nodeState = null;
-	        String nodeId = node.toString();
-	        
-	        //get the nodeData
-	        byte[] nodeData = null;
-	        if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            nodeData = ((WSPNode)o).getData();
-	        }
-	        else if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            nodeData = ((VersionNode)o).getData();
-	        }
-	        
-	        //parse propertyData into propertyState
-	        if(nodeData!=null)
-	        {
-	            Session session = null;
-	            Transaction tx = null;
-	            boolean success = false;
-	            try
-	            {
-	                session = Tools.getOpenSession();
-	                tx = session.beginTransaction();
-	                              
-	                InputStream in = new ByteArrayInputStream(nodeData);
-	                
-	                //setup the propertyState
-	                nodeState = createNew(node);
-	                Serializer.deserialize(nodeState,in);
-	                org.jboss.portal.common.util.Tools.safeClose(in);
-	                
-	                tx.commit();
-	                success = true;
-	            }
-	            catch(Exception e)
-	            {
-	                if (e instanceof NoSuchItemStateException)
-	                {
-	                   throw (NoSuchItemStateException) e;
-	                }
-	                String msg = "failed to read node state from cache: " + node.toString();
-	                log.error(msg, e);
-	                throw new ItemStateException(msg, e);
-	            }
-	            finally
-	            {
-	                if(!success)
-	                {
-	                    tx.rollback();
-	                }
-	                Tools.closeSession(session);
-	            }
-	        }	        
-	        
-	        return nodeState;
-        }
-        catch(CacheException ce)
-        {
-            throw new RuntimeException(ce);
-        }
-    }
-    
-    /**
-     * 
-     *
-     */
-    private void store(NodeState state) throws ItemStateException
-    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+         }
 
-       ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
-       try
-       {
-          Serializer.serialize(state, out);
-          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-          {
-             VersionNode versionNode = new VersionNode(state.getId().toString(), out.toByteArray());
-             
-             //place this in the cache
-             versionNode.resetCacheItemPersistence();
-             String cacheNode = PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(versionNode.getNodeId());
-             pmCache.put(cacheNode,versionNode.getNodeId(),versionNode);
-          }
-          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-          {
+         return nodeState;
+      }
+      catch (CacheException ce)
+      {
+         throw new RuntimeException(ce);
+      }
+   }
 
-             WSPNode wspNode = new WSPNode(state.getId().toString(), out.toByteArray());
-             
-             //place this in the cache
-             wspNode.resetCacheItemPersistence();
-             String cacheNode = PortalCMSCacheLoader.WSP_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(wspNode.getNodeId());
-             pmCache.put(cacheNode,wspNode.getNodeId(),wspNode);
-          }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to write node state: " + state.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-       finally
-       {
-          try
-          {
-             out.close();
-          }
-          catch (Exception e)
-          {
-             e.printStackTrace();
-          }
-       }
-    }
-    
-    /**
-     * 
-     *
-     */
-    private void update(NodeState state) throws ItemStateException
-    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+   /**
+    *
+    *
+    */
+   private void store(NodeState state) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
 
-       ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
-       try
-       {
-          Serializer.serialize(state, out);
-          String id = state.getId().toString();
-          String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
-          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-          {
-             VersionNode versionNode = (VersionNode)pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE+"/"+cacheNodeName,id);
-             if (versionNode == null)
-             {
-                throw new Exception("No such Node: " + state.getId());
-             }
-             versionNode.setData(out.toByteArray());
-             versionNode.resetCacheItemPersistence();
-             pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE+"/"+cacheNodeName,id,versionNode);
-          }
-          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-          {
-             WSPNode wspNode = (WSPNode)pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE+"/"+cacheNodeName,id);
-             if (wspNode == null)
-             {
-                throw new Exception("No such Node: " + state.getId());
-             }
-             wspNode.setData(out.toByteArray());
-             wspNode.resetCacheItemPersistence();
-             pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE+"/"+cacheNodeName,id,wspNode);
-          }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to write node state: " + state.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-       finally
-       {
-          try
-          {
-             out.close();
-          }
-          catch (Exception e)
-          {
-             e.printStackTrace();
-          }
-       }
-    }
-    
-    /**
-     * This is called by store(Changelog) this should not be called anywhere else
-     */
-    private void destroy(NodeState state) throws ItemStateException
-    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+      ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
+      try
+      {
+         Serializer.serialize(state, out);
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            VersionNode versionNode = new VersionNode(state.getId().toString(), out.toByteArray());
 
-       String id = state.getId().toString();
-       String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
-       try
-       {
-           if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-           {
-               pmCache.remove(PortalCMSCacheLoader.VERSION_NODE_NODE+"/"+cacheNodeName,id);
-           }
-           else if(schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-           {
-               pmCache.remove(PortalCMSCacheLoader.WSP_NODE_NODE+"/"+cacheNodeName,id);
-           }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to delete node state: " + state.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-    }
-    
-    //----------actions for property entities-------------------------------------------------------------------------------------------------------------    
-    /* 
-     * 
-     */
-    public boolean exists(PropertyId property) throws ItemStateException 
-    {
-        try
-        {
-	        boolean exists = false;
-	        String propId = property.toString();
-	        if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE+"/"+PortalCMSCacheLoader.parseNodeName(propId),propId);
-	            if(o != null)
-	            {
-	                if(o instanceof WSPProp)
-	                {
-	                    exists = true;
-	                }
-	            }
-	            else
-	            {
-	                this.pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE+"/"+PortalCMSCacheLoader.parseNodeName(propId),propId,new Boolean(false));
-	            }
-	        }
-	        else if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE+"/"+PortalCMSCacheLoader.parseNodeName(propId),propId);
-	            if(o != null)
-	            {
-	                if(o instanceof VersionProp)
-	                {
-	                    exists = true;
-	                }
-	            }
-	            else
-	            {
-	                this.pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE+"/"+PortalCMSCacheLoader.parseNodeName(propId),propId,new Boolean(false));
-	            }
-	        }
-	        return exists;
-        }
-        catch(CacheException ce)
-        {
-            throw new RuntimeException(ce);
-        }
-    }
+            //place this in the cache
+            versionNode.resetCacheItemPersistence();
+            String cacheNode = PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(versionNode.getNodeId());
+            pmCache.put(cacheNode, versionNode.getNodeId(), versionNode);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
 
-    /* 
-     * 
-     */
-    public PropertyState load(PropertyId property) throws NoSuchItemStateException,ItemStateException 
-    {
-        try
-        {
-	        PropertyState propertyState = null;
-	        String propId = property.toString();
-	        
-	        //get the propertyData
-	        byte[] propertyData = null;
-	        if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE+"/"+PortalCMSCacheLoader.parseNodeName(propId),propId);	
-	            propertyData = ((WSPProp)o).getData();
-	        }
-	        else if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE+"/"+PortalCMSCacheLoader.parseNodeName(propId),propId);
-	            propertyData = ((VersionProp)o).getData();
-	        }
-	        
-	        //parse propertyData into propertyState
-	        if(propertyData!=null)
-	        {
-	            Session session = null;
-	            Transaction tx = null;
-	            boolean success = false;
-	            try
-	            {
-	                session = Tools.getOpenSession();
-	                tx = session.beginTransaction();
-	                              
-	                InputStream in = new ByteArrayInputStream(propertyData);
-	                
-	                //setup the propertyState
-	                propertyState = createNew(property);
-	                Serializer.deserialize(propertyState,in,blobStore);
-	                org.jboss.portal.common.util.Tools.safeClose(in);
-	                
-	                tx.commit();
-	                success = true;
-	            }
-	            catch(Exception e)
-	            {
-	                if (e instanceof NoSuchItemStateException)
-	                {
-	                   throw (NoSuchItemStateException) e;
-	                }
-	                String msg = "failed to read property state from cache: " + property.toString();
-	                log.error(msg, e);
-	                throw new ItemStateException(msg, e);
-	            }
-	            finally
-	            {
-	                if(!success)
-	                {
-	                    tx.rollback();
-	                }
-	                Tools.closeSession(session);
-	            }
-	        }	        
-	        
-	        return propertyState;
-        }
-        catch(CacheException ce)
-        {
-            throw new RuntimeException(ce);
-        }
-    }
-            
-    /**
-     * 
-     */
-    private void store(PropertyState state) throws ItemStateException
-    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+            WSPNode wspNode = new WSPNode(state.getId().toString(), out.toByteArray());
 
-       ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
-       try
-       {
-          Serializer.serialize(state,out,blobStore);
-          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-          {
-             VersionProp versionProp = new VersionProp(state.getId().toString(), out.toByteArray());
-             
-             //place this in the cache
-             versionProp.resetCacheItemPersistence();
-             String cacheNode = PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(versionProp.getPropId());
-             pmCache.put(cacheNode,versionProp.getPropId(),versionProp);
-          }
-          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-          {
+            //place this in the cache
+            wspNode.resetCacheItemPersistence();
+            String cacheNode = PortalCMSCacheLoader.WSP_NODE_NODE + "/" + PortalCMSCacheLoader.parseNodeName(wspNode.getNodeId());
+            pmCache.put(cacheNode, wspNode.getNodeId(), wspNode);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to write node state: " + state.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+      finally
+      {
+         try
+         {
+            out.close();
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+      }
+   }
 
-             WSPProp wspProp = new WSPProp(state.getId().toString(), out.toByteArray());
-             
-             //place this in the cache
-             wspProp.resetCacheItemPersistence();
-             String cacheNode = PortalCMSCacheLoader.WSP_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(wspProp.getPropId());
-             pmCache.put(cacheNode,wspProp.getPropId(),wspProp);
-          }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to write property state: " + state.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-       finally
-       {
-          try
-          {
-             out.close();
-          }
-          catch (Exception e)
-          {
-             e.printStackTrace();
-          }
-       }
-    }
-    
-    /**
-     * 
-     *
-     */
-    private void update(PropertyState state) throws ItemStateException
-    {
-        if (!initialized)
-        {
-           throw new IllegalStateException("not initialized");
-        }
+   /**
+    *
+    *
+    */
+   private void update(NodeState state) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
 
-        ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
-        try
-        {
-           Serializer.serialize(state, out, blobStore);
-           String id = state.getId().toString();
-           String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
-           if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-           {
-              VersionProp versionProp = (VersionProp)pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE+"/"+cacheNodeName,id);
-              if (versionProp == null)
-              {
-                 throw new Exception("No such Property: " + state.getId());
-              }
-              versionProp.setData(out.toByteArray());
-              versionProp.resetCacheItemPersistence();
-              pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE+"/"+cacheNodeName,id,versionProp);
-           }
-           else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-           {
-              WSPProp wspProp = (WSPProp)pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE+"/"+cacheNodeName,id);
-              if (wspProp == null)
-              {
-                 throw new Exception("No such Property: " + state.getId());
-              }
-              wspProp.setData(out.toByteArray());
-              wspProp.resetCacheItemPersistence();
-              pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE+"/"+cacheNodeName,id,wspProp);
-           }
-        }
-        catch (Exception e)
-        {
-           String msg = "failed to write property state: " + state.getId();
-           log.error(msg, e);
-           throw new ItemStateException(msg, e);
-        }
-        finally
-        {
-           try
-           {
-              out.close();
-           }
-           catch (Exception e)
-           {
-              e.printStackTrace();
-           }
-        }
-    }
+      ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
+      try
+      {
+         Serializer.serialize(state, out);
+         String id = state.getId().toString();
+         String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            VersionNode versionNode = (VersionNode)pmCache.get(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + cacheNodeName, id);
+            if (versionNode == null)
+            {
+               throw new Exception("No such Node: " + state.getId());
+            }
+            versionNode.setData(out.toByteArray());
+            versionNode.resetCacheItemPersistence();
+            pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + cacheNodeName, id, versionNode);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            WSPNode wspNode = (WSPNode)pmCache.get(PortalCMSCacheLoader.WSP_NODE_NODE + "/" + cacheNodeName, id);
+            if (wspNode == null)
+            {
+               throw new Exception("No such Node: " + state.getId());
+            }
+            wspNode.setData(out.toByteArray());
+            wspNode.resetCacheItemPersistence();
+            pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE + "/" + cacheNodeName, id, wspNode);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to write node state: " + state.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+      finally
+      {
+         try
+         {
+            out.close();
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+      }
+   }
 
-    /**
-     * This is called by store(Changelog) this should not be called anywhere else
-     */
-    private void destroy(PropertyState state) throws ItemStateException
-    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+   /** This is called by store(Changelog) this should not be called anywhere else */
+   private void destroy(NodeState state) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
 
-       // make sure binary values (BLOBs) are properly removed
-       InternalValue[] values = state.getValues();
-       if (values != null)
-       {
-          for (int i = 0; i < values.length; i++)
-          {
-             InternalValue val = values[i];
-             if (val != null)
-             {
-                if (val.getType() == PropertyType.BINARY)
-                {
-                   BLOBFileValue blobVal = (BLOBFileValue) val.internalValue();
-                   // delete internal resource representation of BLOB value
-                   blobVal.delete(true);
-                   // also remove from BLOBStore
-                   String blobId = blobStore.createId((PropertyId) state.getId(), i);
-                   try
-                   {
-                      blobStore.remove(blobId);
-                   }
-                   catch (Exception e)
-                   {
-                      log.warn("failed to remove from BLOBStore: " + blobId, e);
-                   }
-                }
-             }
-          }
-       }
+      String id = state.getId().toString();
+      String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
+      try
+      {
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            pmCache.remove(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" + cacheNodeName, id);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            pmCache.remove(PortalCMSCacheLoader.WSP_NODE_NODE + "/" + cacheNodeName, id);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to delete node state: " + state.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+   }
 
-       //remove the property node
-       String id = state.getId().toString();
-       String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
-       try
-       {
-           if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-           {
-               pmCache.remove(PortalCMSCacheLoader.VERSION_PROP_NODE+"/"+cacheNodeName,id);
-           }
-           else if(schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-           {
-               pmCache.remove(PortalCMSCacheLoader.WSP_PROP_NODE+"/"+cacheNodeName,id);
-           }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to delete property state: " + state.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-    }
-    //----------actions for nodereferences entities-------------------------------------------------------------------------------------------------------------
-    /**
+   //----------actions for property entities-------------------------------------------------------------------------------------------------------------
+   /*
+   *
+   */
+   public boolean exists(PropertyId property) throws ItemStateException
+   {
+      try
+      {
+         boolean exists = false;
+         String propId = property.toString();
+         if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId);
+            if (o != null)
+            {
+               if (o instanceof WSPProp)
+               {
+                  exists = true;
+               }
+            }
+            else
+            {
+               this.pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId, new Boolean(false));
+            }
+         }
+         else if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId);
+            if (o != null)
+            {
+               if (o instanceof VersionProp)
+               {
+                  exists = true;
+               }
+            }
+            else
+            {
+               this.pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId, new Boolean(false));
+            }
+         }
+         return exists;
+      }
+      catch (CacheException ce)
+      {
+         throw new RuntimeException(ce);
+      }
+   }
+
+   /*
+   *
+   */
+   public PropertyState load(PropertyId property) throws NoSuchItemStateException, ItemStateException
+   {
+      try
+      {
+         PropertyState propertyState = null;
+         String propId = property.toString();
+
+         //get the propertyData
+         byte[] propertyData = null;
+         if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId);
+            propertyData = ((WSPProp)o).getData();
+         }
+         else if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId);
+            propertyData = ((VersionProp)o).getData();
+         }
+
+         //parse propertyData into propertyState
+         if (propertyData != null)
+         {
+            Session session = null;
+            Transaction tx = null;
+            boolean success = false;
+            try
+            {
+               session = Tools.getOpenSession();
+               tx = session.beginTransaction();
+
+               InputStream in = new ByteArrayInputStream(propertyData);
+
+               //setup the propertyState
+               propertyState = createNew(property);
+               Serializer.deserialize(propertyState, in, blobStore);
+               org.jboss.portal.common.util.Tools.safeClose(in);
+
+               tx.commit();
+               success = true;
+            }
+            catch (Exception e)
+            {
+               if (e instanceof NoSuchItemStateException)
+               {
+                  throw(NoSuchItemStateException)e;
+               }
+               String msg = "failed to read property state from cache: " + property.toString();
+               log.error(msg, e);
+               throw new ItemStateException(msg, e);
+            }
+            finally
+            {
+               if (!success)
+               {
+                  tx.rollback();
+               }
+               Tools.closeSession(session);
+            }
+         }
+
+         return propertyState;
+      }
+      catch (CacheException ce)
+      {
+         throw new RuntimeException(ce);
+      }
+   }
+
+   /**
     *
     */
+   private void store(PropertyState state) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
+
+      ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
+      try
+      {
+         Serializer.serialize(state, out, blobStore);
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            VersionProp versionProp = new VersionProp(state.getId().toString(), out.toByteArray());
+
+            //place this in the cache
+            versionProp.resetCacheItemPersistence();
+            String cacheNode = PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(versionProp.getPropId());
+            pmCache.put(cacheNode, versionProp.getPropId(), versionProp);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+
+            WSPProp wspProp = new WSPProp(state.getId().toString(), out.toByteArray());
+
+            //place this in the cache
+            wspProp.resetCacheItemPersistence();
+            String cacheNode = PortalCMSCacheLoader.WSP_PROP_NODE + "/" + PortalCMSCacheLoader.parseNodeName(wspProp.getPropId());
+            pmCache.put(cacheNode, wspProp.getPropId(), wspProp);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to write property state: " + state.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+      finally
+      {
+         try
+         {
+            out.close();
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+      }
+   }
+
+   /**
+    *
+    *
+    */
+   private void update(PropertyState state) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
+
+      ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
+      try
+      {
+         Serializer.serialize(state, out, blobStore);
+         String id = state.getId().toString();
+         String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            VersionProp versionProp = (VersionProp)pmCache.get(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + cacheNodeName, id);
+            if (versionProp == null)
+            {
+               throw new Exception("No such Property: " + state.getId());
+            }
+            versionProp.setData(out.toByteArray());
+            versionProp.resetCacheItemPersistence();
+            pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + cacheNodeName, id, versionProp);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            WSPProp wspProp = (WSPProp)pmCache.get(PortalCMSCacheLoader.WSP_PROP_NODE + "/" + cacheNodeName, id);
+            if (wspProp == null)
+            {
+               throw new Exception("No such Property: " + state.getId());
+            }
+            wspProp.setData(out.toByteArray());
+            wspProp.resetCacheItemPersistence();
+            pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE + "/" + cacheNodeName, id, wspProp);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to write property state: " + state.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+      finally
+      {
+         try
+         {
+            out.close();
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+      }
+   }
+
+   /** This is called by store(Changelog) this should not be called anywhere else */
+   private void destroy(PropertyState state) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
+
+      // make sure binary values (BLOBs) are properly removed
+      InternalValue[] values = state.getValues();
+      if (values != null)
+      {
+         for (int i = 0; i < values.length; i++)
+         {
+            InternalValue val = values[i];
+            if (val != null)
+            {
+               if (val.getType() == PropertyType.BINARY)
+               {
+                  BLOBFileValue blobVal = (BLOBFileValue)val.internalValue();
+                  // delete internal resource representation of BLOB value
+                  blobVal.delete(true);
+                  // also remove from BLOBStore
+                  String blobId = blobStore.createId((PropertyId)state.getId(), i);
+                  try
+                  {
+                     blobStore.remove(blobId);
+                  }
+                  catch (Exception e)
+                  {
+                     log.warn("failed to remove from BLOBStore: " + blobId, e);
+                  }
+               }
+            }
+         }
+      }
+
+      //remove the property node
+      String id = state.getId().toString();
+      String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
+      try
+      {
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            pmCache.remove(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" + cacheNodeName, id);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            pmCache.remove(PortalCMSCacheLoader.WSP_PROP_NODE + "/" + cacheNodeName, id);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to delete property state: " + state.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+   }
+
+   //----------actions for nodereferences entities-------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    */
    public boolean exists(NodeReferencesId targetId) throws ItemStateException
    {
-       try
-       {
-	        boolean exists = false;
-	        String nodeId = targetId.toString();
-	        if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_REF_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            if(o != null)
-	            {
-	                if(o instanceof WSPRefs)
-	                {
-	                    exists = true;
-	                }
-	            }
-	            else
-	            {
-	                this.pmCache.put(PortalCMSCacheLoader.WSP_REF_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId,new Boolean(false));
-	            }
-	        }
-	        else if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_REF_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            if(o != null)
-	            {
-	                if(o instanceof VersionRefs)
-	                {
-	                    exists = true;
-	                }
-	            }
-	            else
-	            {
-	                this.pmCache.put(PortalCMSCacheLoader.VERSION_REF_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId,new Boolean(false));
-	            }
-	        }
-	        return exists;
-       }
-       catch(CacheException ce)
-       {
-           throw new RuntimeException(ce);
-       }
+      try
+      {
+         boolean exists = false;
+         String nodeId = targetId.toString();
+         if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            if (o != null)
+            {
+               if (o instanceof WSPRefs)
+               {
+                  exists = true;
+               }
+            }
+            else
+            {
+               this.pmCache.put(PortalCMSCacheLoader.WSP_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, new Boolean(false));
+            }
+         }
+         else if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            if (o != null)
+            {
+               if (o instanceof VersionRefs)
+               {
+                  exists = true;
+               }
+            }
+            else
+            {
+               this.pmCache.put(PortalCMSCacheLoader.VERSION_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, new Boolean(false));
+            }
+         }
+         return exists;
+      }
+      catch (CacheException ce)
+      {
+         throw new RuntimeException(ce);
+      }
    }
-    
-    /**
+
+   /**
     *
     */
    public NodeReferences load(NodeReferencesId targetId) throws NoSuchItemStateException, ItemStateException
    {
-       try
-       {
-	        NodeReferences refs = null;
-	        String nodeId = targetId.toString();
-	        
-	        //get the nodeData
-	        byte[] nodeData = null;
-	        if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_REF_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            if(o == null || !(o instanceof Base))
-	            {
-	                throw new NoSuchItemStateException(targetId.toString()); 
-	            }
-	            nodeData = ((WSPRefs)o).getData();
-	        }
-	        else if(this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-	        {
-	            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_REF_NODE+"/"+PortalCMSCacheLoader.parseNodeName(nodeId),nodeId);
-	            if(o == null || !(o instanceof Base))
-	            {
-	                throw new NoSuchItemStateException(targetId.toString()); 
-	            }
-	            nodeData = ((VersionRefs)o).getData();
-	        }
-	        
-	        //parse propertyData into propertyState
-	        if(nodeData!=null)
-	        {
-	            Session session = null;
-	            Transaction tx = null;
-	            boolean success = false;
-	            try
-	            {
-	                session = Tools.getOpenSession();
-	                tx = session.beginTransaction();
-	                              
-	                InputStream in = new ByteArrayInputStream(nodeData);
-	                
-	                //setup the propertyState
-	                refs = new NodeReferences(targetId);
-	                Serializer.deserialize(refs,in);
-	                org.jboss.portal.common.util.Tools.safeClose(in);
-	                
-	                tx.commit();
-	                success = true;
-	            }
-	            catch(Exception e)
-	            {
-	                if (e instanceof NoSuchItemStateException)
-	                {
-	                   throw (NoSuchItemStateException) e;
-	                }
-	                String msg = "failed to read reference from cache: " + targetId.toString();
-	                log.error(msg, e);
-	                throw new ItemStateException(msg, e);
-	            }
-	            finally
-	            {
-	                if(!success)
-	                {
-	                    tx.rollback();
-	                }
-	                Tools.closeSession(session);
-	            }
-	        }	        
-	        
-	        return refs;
-       }
-       catch(CacheException ce)
-       {
-           throw new RuntimeException(ce);
-       }
+      try
+      {
+         NodeReferences refs = null;
+         String nodeId = targetId.toString();
+
+         //get the nodeData
+         byte[] nodeData = null;
+         if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.WSP_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            if (o == null || !(o instanceof Base))
+            {
+               throw new NoSuchItemStateException(targetId.toString());
+            }
+            nodeData = ((WSPRefs)o).getData();
+         }
+         else if (this.schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            Object o = this.pmCache.get(PortalCMSCacheLoader.VERSION_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId);
+            if (o == null || !(o instanceof Base))
+            {
+               throw new NoSuchItemStateException(targetId.toString());
+            }
+            nodeData = ((VersionRefs)o).getData();
+         }
+
+         //parse propertyData into propertyState
+         if (nodeData != null)
+         {
+            Session session = null;
+            Transaction tx = null;
+            boolean success = false;
+            try
+            {
+               session = Tools.getOpenSession();
+               tx = session.beginTransaction();
+
+               InputStream in = new ByteArrayInputStream(nodeData);
+
+               //setup the propertyState
+               refs = new NodeReferences(targetId);
+               Serializer.deserialize(refs, in);
+               org.jboss.portal.common.util.Tools.safeClose(in);
+
+               tx.commit();
+               success = true;
+            }
+            catch (Exception e)
+            {
+               if (e instanceof NoSuchItemStateException)
+               {
+                  throw(NoSuchItemStateException)e;
+               }
+               String msg = "failed to read reference from cache: " + targetId.toString();
+               log.error(msg, e);
+               throw new ItemStateException(msg, e);
+            }
+            finally
+            {
+               if (!success)
+               {
+                  tx.rollback();
+               }
+               Tools.closeSession(session);
+            }
+         }
+
+         return refs;
+      }
+      catch (CacheException ce)
+      {
+         throw new RuntimeException(ce);
+      }
    }
-   
+
    /**
-    * 
     *
+    *
     */
    private void store(NodeReferences refs) throws ItemStateException
    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
 
-       ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
-       try
-       {
-          Serializer.serialize(refs,out);
-          if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-          {
-             VersionRefs versionRefs = new VersionRefs(refs.getId().toString(), out.toByteArray());
-             
-             //place this in the cache
-             versionRefs.resetCacheItemPersistence();
-             String cacheNode = PortalCMSCacheLoader.VERSION_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(versionRefs.getRefId());
-             pmCache.put(cacheNode,versionRefs.getRefId(),versionRefs);
-          }
-          else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-          {
+      ByteArrayOutputStream out = new ByteArrayOutputStream(INITIAL_BUFFER_SIZE);
+      try
+      {
+         Serializer.serialize(refs, out);
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            VersionRefs versionRefs = new VersionRefs(refs.getId().toString(), out.toByteArray());
 
-             WSPRefs wspRefs = new WSPRefs(refs.getId().toString(), out.toByteArray());
-             
-             //place this in the cache
-             wspRefs.resetCacheItemPersistence();
-             String cacheNode = PortalCMSCacheLoader.WSP_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(wspRefs.getRefId());
-             pmCache.put(cacheNode,wspRefs.getRefId(),wspRefs);
-          }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to write reference state: " + refs.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-       finally
-       {
-          try
-          {
-             out.close();
-          }
-          catch (Exception e)
-          {
-             e.printStackTrace();
-          }
-       }
+            //place this in the cache
+            versionRefs.resetCacheItemPersistence();
+            String cacheNode = PortalCMSCacheLoader.VERSION_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(versionRefs.getRefId());
+            pmCache.put(cacheNode, versionRefs.getRefId(), versionRefs);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+
+            WSPRefs wspRefs = new WSPRefs(refs.getId().toString(), out.toByteArray());
+
+            //place this in the cache
+            wspRefs.resetCacheItemPersistence();
+            String cacheNode = PortalCMSCacheLoader.WSP_REF_NODE + "/" + PortalCMSCacheLoader.parseNodeName(wspRefs.getRefId());
+            pmCache.put(cacheNode, wspRefs.getRefId(), wspRefs);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to write reference state: " + refs.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+      finally
+      {
+         try
+         {
+            out.close();
+         }
+         catch (Exception e)
+         {
+            e.printStackTrace();
+         }
+      }
    }
-   
+
    /**
     *
     */
    private void destroy(NodeReferences refs) throws ItemStateException
    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
 
-       String id = refs.getId().toString();
-       String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
-       try
-       {
-           if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-           {
-               pmCache.remove(PortalCMSCacheLoader.VERSION_REF_NODE+"/"+cacheNodeName,id);
-           }
-           else if(schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-           {
-               pmCache.remove(PortalCMSCacheLoader.WSP_REF_NODE+"/"+cacheNodeName,id);
-           }
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to delete reference state: " + refs.getId();
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-   }          
-    //----------------------------------------------------------------------------------------------------------------------------------------
-    /**
+      String id = refs.getId().toString();
+      String cacheNodeName = PortalCMSCacheLoader.parseNodeName(id);
+      try
+      {
+         if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+         {
+            pmCache.remove(PortalCMSCacheLoader.VERSION_REF_NODE + "/" + cacheNodeName, id);
+         }
+         else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+         {
+            pmCache.remove(PortalCMSCacheLoader.WSP_REF_NODE + "/" + cacheNodeName, id);
+         }
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to delete reference state: " + refs.getId();
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+   }
+
+   //----------------------------------------------------------------------------------------------------------------------------------------
+   /**
     *
     */
    public void close() throws Exception
@@ -1196,299 +1181,297 @@
       }
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   /** {@inheritDoc} */
    public NodeState createNew(NodeId id)
    {
       return new NodeState(id, null, null, NodeState.STATUS_NEW, false);
    }
 
-   /**
-    * {@inheritDoc}
-    */
+   /** {@inheritDoc} */
    public PropertyState createNew(PropertyId id)
    {
       return new PropertyState(id, PropertyState.STATUS_NEW, false);
    }
-   
-    /**
-     * 
-     */
-    public void store(ChangeLog changeLog) throws ItemStateException
-    {
-       Session session = null;
-       Transaction tx = null;
-       try
-       {
-          session = Tools.getOpenSession();
-          tx = session.beginTransaction();
-          storeHB(changeLog);
-          tx.commit();
-       }
-       catch (ItemStateException e)
-       {
-          tx.rollback();
-          throw e;
-       }
-       finally
-       {
-          Tools.closeSession(session);            
-       }
-    }
-    
-    private Blob createBlob(byte[] bytes)
-    {
-       return Hibernate.createBlob(bytes);
-       //return new ByteArrayBlob(bytes);
-    }
 
-    public void storeHB(ChangeLog changeLog) throws ItemStateException
-    {
-       Iterator iter = changeLog.deletedStates();
-       while (iter.hasNext())
-       {
-          ItemState state = (ItemState) iter.next();
-          if (state.isNode())
-          {
-             destroy((NodeState) state);
-          }
-          else
-          {
-             destroy((PropertyState) state);
-          }
-       }
-       iter = changeLog.addedStates();
-       while (iter.hasNext())
-       {
-          ItemState state = (ItemState) iter.next();
-          if (state.isNode())
-          {
-             store((NodeState) state);
-          }
-          else
-          {
-             store((PropertyState) state);
-          }
-       }
-       iter = changeLog.modifiedStates();
-       while (iter.hasNext())
-       {
-          ItemState state = (ItemState) iter.next();
-          if (state.isNode())
-          {
-             update((NodeState) state);
-          }
-          else
-          {
-             update((PropertyState) state);
-          }
-       }
-       iter = changeLog.modifiedRefs();
-       while (iter.hasNext())
-       {
-          NodeReferences refs = (NodeReferences) iter.next();
-          if (refs.hasReferences())
-          {
-             store(refs);
-          }
-          else
-          {
-             if (exists(refs.getId()))
-             {
-                destroy(refs);
-             }
-          }
-       }
-    }
+   /**
+    *
+    */
+   public void store(ChangeLog changeLog) throws ItemStateException
+   {
+      Session session = null;
+      Transaction tx = null;
+      try
+      {
+         session = Tools.getOpenSession();
+         tx = session.beginTransaction();
+         storeHB(changeLog);
+         tx.commit();
+      }
+      catch (ItemStateException e)
+      {
+         tx.rollback();
+         throw e;
+      }
+      finally
+      {
+         Tools.closeSession(session);
+      }
+   }
 
-    /**
-     *
-     */
-    protected boolean exists(String blobid) throws ItemStateException
-    {
-       return exists(blobSelectExist, blobid);
-    }
-    
-    /**
-     * 
-     *
-     */
-    private boolean exists(String query, String id) throws ItemStateException
-    {
-       if (!initialized)
-       {
-          throw new IllegalStateException("not initialized");
-       }
+   private Blob createBlob(byte[] bytes)
+   {
+      return Hibernate.createBlob(bytes);
+      //return new ByteArrayBlob(bytes);
+   }
 
-       Session session = Tools.getOpenSession();
-       try
-       {
-          List rs = session.createQuery(query).setCacheable(true).setString(0, id).list();
-          Iterator iter = rs.iterator();
-          return iter.hasNext();
-       }
-       catch (Exception e)
-       {
-          String msg = "failed to check existence of node state: " + id;
-          log.error(msg, e);
-          throw new ItemStateException(msg, e);
-       }
-       finally
-       {
-          Tools.closeSession(session);
-       }
+   public void storeHB(ChangeLog changeLog) throws ItemStateException
+   {
+      Iterator iter = changeLog.deletedStates();
+      while (iter.hasNext())
+      {
+         ItemState state = (ItemState)iter.next();
+         if (state.isNode())
+         {
+            destroy((NodeState)state);
+         }
+         else
+         {
+            destroy((PropertyState)state);
+         }
+      }
+      iter = changeLog.addedStates();
+      while (iter.hasNext())
+      {
+         ItemState state = (ItemState)iter.next();
+         if (state.isNode())
+         {
+            store((NodeState)state);
+         }
+         else
+         {
+            store((PropertyState)state);
+         }
+      }
+      iter = changeLog.modifiedStates();
+      while (iter.hasNext())
+      {
+         ItemState state = (ItemState)iter.next();
+         if (state.isNode())
+         {
+            update((NodeState)state);
+         }
+         else
+         {
+            update((PropertyState)state);
+         }
+      }
+      iter = changeLog.modifiedRefs();
+      while (iter.hasNext())
+      {
+         NodeReferences refs = (NodeReferences)iter.next();
+         if (refs.hasReferences())
+         {
+            store(refs);
+         }
+         else
+         {
+            if (exists(refs.getId()))
+            {
+               destroy(refs);
+            }
+         }
+      }
+   }
 
-    }
-    //-------------------------------------------------< misc. helper methods >
-    protected void logException(String message, SQLException se)
-    {
-       if (message != null)
-       {
-          log.error(message);
-       }
-       log.error("    reason: " + se.getMessage());
-       log.error("state/code: " + se.getSQLState() + "/" + se.getErrorCode());
-       log.debug("      dump:", se);
-    }
-    //--------------------------------------------------------< inner classes >
-    class DbBLOBStore implements BLOBStore
-    {
+   /**
+    *
+    */
+   protected boolean exists(String blobid) throws ItemStateException
+   {
+      return exists(blobSelectExist, blobid);
+   }
 
-       /**
-        *
-        */
-       public String createId(PropertyId id, int index)
-       {
-          // the blobId is a simple string concatenation of id plus index
-          StringBuffer sb = new StringBuffer();
-          sb.append(id.toString());
-          sb.append('[');
-          sb.append(index);
-          sb.append(']');
-          return sb.toString();
-       }
+   /**
+    *
+    *
+    */
+   private boolean exists(String query, String id) throws ItemStateException
+   {
+      if (!initialized)
+      {
+         throw new IllegalStateException("not initialized");
+      }
 
-       /**
-        *
-        */
-       public InputStream get(String blobId) throws Exception
-       {
-          Session session = Tools.getCurrentSession();
-          try
-          {
-             List rs = session.createQuery(blobSelectData).setCacheable(true).setString(0, blobId).list();
-             Iterator iter = rs.iterator();
-             java.sql.Blob blob = (java.sql.Blob) iter.next();
-             InputStream is = blob.getBinaryStream();
-             return is;
-          }
-          catch (Exception e)
-          {
-             if (e instanceof NoSuchItemStateException)
-             {
-                throw (NoSuchItemStateException) e;
-             }
-             String msg = "failed to read binary data: " + blobId;
-             log.error(msg, e);
-             throw new ItemStateException(msg, e);
-          }
-       }
+      Session session = Tools.getOpenSession();
+      try
+      {
+         List rs = session.createQuery(query).setCacheable(true).setString(0, id).list();
+         Iterator iter = rs.iterator();
+         return iter.hasNext();
+      }
+      catch (Exception e)
+      {
+         String msg = "failed to check existence of node state: " + id;
+         log.error(msg, e);
+         throw new ItemStateException(msg, e);
+      }
+      finally
+      {
+         Tools.closeSession(session);
+      }
 
-       /**
-        *
-        */
-       public void put(String blobId, InputStream in, long size) throws Exception
-       {
-          boolean update = exists(blobId);
+   }
 
-          Session session = Tools.getCurrentSession();
+   //-------------------------------------------------< misc. helper methods >
+   protected void logException(String message, SQLException se)
+   {
+      if (message != null)
+      {
+         log.error(message);
+      }
+      log.error("    reason: " + se.getMessage());
+      log.error("state/code: " + se.getSQLState() + "/" + se.getErrorCode());
+      log.debug("      dump:", se);
+   }
 
-          if (update)
-          {
-             try
-             {
+   //--------------------------------------------------------< inner classes >
+   class DbBLOBStore implements BLOBStore
+   {
 
-                Query query = session.createQuery(blobSelect).setCacheable(true);
-                if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-                {
-                   query.setString(0, blobId);
-                   VersionBinVal versionNode = (VersionBinVal) query.uniqueResult();
-                   if (versionNode == null)
-                   {
-                      throw new Exception("No such Node: " + blobId);
-                   }
-                   versionNode.setId(blobId);
-                   versionNode.setData(Hibernate.createBlob(in));
-                }
-                else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-                {
-                   query.setString(0, blobId);
-                   WSPBinVal wspNode = (WSPBinVal) query.uniqueResult();
-                   if (wspNode == null)
-                   {
-                      throw new Exception("No such Node: " + blobId);
-                   }
-                   wspNode.setId(blobId);
-                   wspNode.setData(Hibernate.createBlob(in));
-                }
-             }
-             catch (Exception e)
-             {
-                String msg = "failed to write node state: " + blobId;
-                log.error(msg, e);
-                throw new ItemStateException(msg, e);
-             }
-          }
-          else
-          // insert
-          {
-             try
-             {
+      /**
+       *
+       */
+      public String createId(PropertyId id, int index)
+      {
+         // the blobId is a simple string concatenation of id plus index
+         StringBuffer sb = new StringBuffer();
+         sb.append(id.toString());
+         sb.append('[');
+         sb.append(index);
+         sb.append(']');
+         return sb.toString();
+      }
 
-                if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
-                {
-                   VersionBinVal versionNode = new VersionBinVal(blobId, Hibernate.createBlob(in));
-                   session.save(versionNode);
-                }
-                else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
-                {
-                   WSPBinVal wspNode = new WSPBinVal(blobId, Hibernate.createBlob(in));
-                   session.save(wspNode);
-                }
-             }
-             catch (Exception e)
-             {
-                String msg = "failed to write node state: " + blobId;
-                log.error(msg, e);
-                throw new ItemStateException(msg, e);
-             }
-          }
-       }
+      /**
+       *
+       */
+      public InputStream get(String blobId) throws Exception
+      {
+         Session session = Tools.getCurrentSession();
+         try
+         {
+            List rs = session.createQuery(blobSelectData).setCacheable(true).setString(0, blobId).list();
+            Iterator iter = rs.iterator();
+            java.sql.Blob blob = (java.sql.Blob)iter.next();
+            InputStream is = blob.getBinaryStream();
+            return is;
+         }
+         catch (Exception e)
+         {
+            if (e instanceof NoSuchItemStateException)
+            {
+               throw(NoSuchItemStateException)e;
+            }
+            String msg = "failed to read binary data: " + blobId;
+            log.error(msg, e);
+            throw new ItemStateException(msg, e);
+         }
+      }
 
-       /**
-        *
-        */
-       //      public synchronized boolean remove(String blobId) throws Exception
-       public boolean remove(String blobId) throws Exception
-       {
-          Session session = Tools.getCurrentSession();
-          try
-          {
-             Query query = session.createQuery(nodeBinValSelect).setCacheable(true).setString(0, blobId);
-             Object result = query.uniqueResult();
-             if (result != null)
-             {
-                session.delete(result);
-             }
-             return true;
-          }
-          catch (Exception e)
-          {
-             String msg = "failed to delete binval: " + blobId;
-             log.error(msg, e);
-             throw new ItemStateException(msg, e);
-          }
-       }
-    }        
+      /**
+       *
+       */
+      public void put(String blobId, InputStream in, long size) throws Exception
+      {
+         boolean update = exists(blobId);
+
+         Session session = Tools.getCurrentSession();
+
+         if (update)
+         {
+            try
+            {
+
+               Query query = session.createQuery(blobSelect).setCacheable(true);
+               if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+               {
+                  query.setString(0, blobId);
+                  VersionBinVal versionNode = (VersionBinVal)query.uniqueResult();
+                  if (versionNode == null)
+                  {
+                     throw new Exception("No such Node: " + blobId);
+                  }
+                  versionNode.setId(blobId);
+                  versionNode.setData(Hibernate.createBlob(in));
+               }
+               else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+               {
+                  query.setString(0, blobId);
+                  WSPBinVal wspNode = (WSPBinVal)query.uniqueResult();
+                  if (wspNode == null)
+                  {
+                     throw new Exception("No such Node: " + blobId);
+                  }
+                  wspNode.setId(blobId);
+                  wspNode.setData(Hibernate.createBlob(in));
+               }
+            }
+            catch (Exception e)
+            {
+               String msg = "failed to write node state: " + blobId;
+               log.error(msg, e);
+               throw new ItemStateException(msg, e);
+            }
+         }
+         else
+         // insert
+         {
+            try
+            {
+
+               if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.versionPrefix))
+               {
+                  VersionBinVal versionNode = new VersionBinVal(blobId, Hibernate.createBlob(in));
+                  session.save(versionNode);
+               }
+               else if (schemaObjectPrefix.equalsIgnoreCase(HibernateStoreConstants.wspPrefix))
+               {
+                  WSPBinVal wspNode = new WSPBinVal(blobId, Hibernate.createBlob(in));
+                  session.save(wspNode);
+               }
+            }
+            catch (Exception e)
+            {
+               String msg = "failed to write node state: " + blobId;
+               log.error(msg, e);
+               throw new ItemStateException(msg, e);
+            }
+         }
+      }
+
+      /**
+       *
+       */
+      //      public synchronized boolean remove(String blobId) throws Exception
+      public boolean remove(String blobId) throws Exception
+      {
+         Session session = Tools.getCurrentSession();
+         try
+         {
+            Query query = session.createQuery(nodeBinValSelect).setCacheable(true).setString(0, blobId);
+            Object result = query.uniqueResult();
+            if (result != null)
+            {
+               session.delete(result);
+            }
+            return true;
+         }
+         catch (Exception e)
+         {
+            String msg = "failed to delete binval: " + blobId;
+            log.error(msg, e);
+            throw new ItemStateException(msg, e);
+         }
+      }
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/PortalCMSCacheLoader.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,845 +1,840 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
+import org.apache.log4j.Logger;
+import org.hibernate.Session;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.Modification;
+import org.jboss.cache.TreeCache;
+import org.jboss.cache.loader.CacheLoader;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Collections;
 
-import org.jboss.cache.Fqn;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.loader.CacheLoader;
-import org.jboss.cache.Modification;
 
-import org.jboss.portal.cms.hibernate.state.Base;
-import org.jboss.portal.cms.hibernate.state.WSPProp;
-import org.jboss.portal.cms.hibernate.state.VersionProp;
-import org.jboss.portal.cms.hibernate.state.WSPNode;
-import org.jboss.portal.cms.hibernate.state.VersionNode;
-
-import org.apache.log4j.Logger;
-import org.hibernate.Session;
-
-
 /*
  * Created on Aug 29, 2006
  *
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
  */
-public class PortalCMSCacheLoader implements CacheLoader 
+public class PortalCMSCacheLoader implements CacheLoader
 {
-    /**
-     * Logger instance
-     */
-    private static Logger log = Logger.getLogger(PortalCMSCacheLoader.class);
-    
-    /**
-     * 
-     */
-    private static final String loadWSPProps = "from org.jboss.portal.cms.hibernate.state.WSPProp";
-    private static final String loadWSPPropChildren = "select property.propId from org.jboss.portal.cms.hibernate.state.WSPProp property";
-    private static final String loadWSPProp = "from org.jboss.portal.cms.hibernate.state.WSPProp property where property.propId=?";
-    private static final String loadVersionProps = "from org.jboss.portal.cms.hibernate.state.VersionProp";  
-    private static final String loadVersionPropChildren = "select property.propId from org.jboss.portal.cms.hibernate.state.VersionProp property";
-    private static final String loadVersionProp = "from org.jboss.portal.cms.hibernate.state.VersionProp property where property.propId=?";
-    
-    /**
-     * 
-     */
-    private static final String loadWSPNodes = "from org.jboss.portal.cms.hibernate.state.WSPNode";
-    private static final String loadWSPNodeChildren = "select node.nodeId from org.jboss.portal.cms.hibernate.state.WSPNode node";
-    private static final String loadWSPNode = "from org.jboss.portal.cms.hibernate.state.WSPNode node where node.nodeId=?";
-    private static final String loadVersionNodes = "from org.jboss.portal.cms.hibernate.state.VersionNode";
-    private static final String loadVersionNodeChildren = "select node.nodeId from org.jboss.portal.cms.hibernate.state.VersionNode node";
-    private static final String loadVersionNode = "from org.jboss.portal.cms.hibernate.state.VersionNode node where node.nodeId=?";
-    
-    /**
-     * 
-     */
-    private static final String loadWSPRefs = "from org.jboss.portal.cms.hibernate.state.WSPRefs";
-    private static final String loadWSPRefsChildren = "select ref.refId from org.jboss.portal.cms.hibernate.state.WSPRefs ref";
-    private static final String loadWSPRef = "from org.jboss.portal.cms.hibernate.state.WSPRefs ref where ref.refId=?";
-    private static final String loadVersionRefs = "from org.jboss.portal.cms.hibernate.state.VersionRefs";
-    private static final String loadVersionRefsChildren = "select ref.refId from org.jboss.portal.cms.hibernate.state.VersionRefs ref";
-    private static final String loadVersionRef = "from org.jboss.portal.cms.hibernate.state.VersionRefs ref where ref.refId=?";
-    
-    
-    /**
-     * 
-     */
-    public static final String WSP_PROP_NODE = "/wsp_prop";
-    public static final String VERSION_PROP_NODE = "/version_prop";
-    public static final String WSP_NODE_NODE = "/wsp_node";
-    public static final String VERSION_NODE_NODE = "/version_node";
-    public static final String WSP_REF_NODE = "/wsp_ref";
-    public static final String VERSION_REF_NODE = "/version_ref";
-    
-    /**
-     * map of propertyId-nodeName map
-     */
-    private static Map nodeNames = Collections.synchronizedMap(new HashMap());
-    
-    /**
-     * 
-     */
-    private TreeCache cache = null;
-    
-    
-    /**
-     * 
-     */
-    public void setConfig(Properties properties) 
-    {
-    }
+   /** Logger instance */
+   private static Logger log = Logger.getLogger(PortalCMSCacheLoader.class);
 
-    /**
-     * 
-     */
-    public void setCache(TreeCache cache) 
-    {
-        this.cache = cache;                
-    }
+   /**
+    *
+    */
+   private static final String loadWSPProps = "from org.jboss.portal.cms.hibernate.state.WSPProp";
+   private static final String loadWSPPropChildren = "select property.propId from org.jboss.portal.cms.hibernate.state.WSPProp property";
+   private static final String loadWSPProp = "from org.jboss.portal.cms.hibernate.state.WSPProp property where property.propId=?";
+   private static final String loadVersionProps = "from org.jboss.portal.cms.hibernate.state.VersionProp";
+   private static final String loadVersionPropChildren = "select property.propId from org.jboss.portal.cms.hibernate.state.VersionProp property";
+   private static final String loadVersionProp = "from org.jboss.portal.cms.hibernate.state.VersionProp property where property.propId=?";
 
-    /**
-     * 
-     */
-    public Set getChildrenNames(Fqn fqn) throws Exception 
-    {
-        Set children = null;
-        
-        if(fqn.toString().equals("/"))
-        {
-            children = new HashSet();
-            children.add(WSP_PROP_NODE.substring(1));
-            children.add(VERSION_PROP_NODE.substring(1));
-            children.add(WSP_NODE_NODE.substring(1));
-            children.add(VERSION_NODE_NODE.substring(1));
-        }
-        else if(fqn.toString().equals(WSP_PROP_NODE))
-        {
-            children = this.getChildrenNames(loadWSPPropChildren);
-        }
-        else if(fqn.toString().equals(VERSION_PROP_NODE))
-        {
-            children = this.getChildrenNames(loadVersionPropChildren);
-        }
-        else if(fqn.toString().equals(WSP_NODE_NODE))
-        {
-            children = this.getChildrenNames(loadWSPNodeChildren);
-        }
-        else if(fqn.toString().equals(VERSION_NODE_NODE))
-        {
-            children = this.getChildrenNames(loadVersionNodeChildren);
-        }
-        else if(fqn.toString().equals(WSP_REF_NODE))
-        {
-            children = this.getChildrenNames(loadWSPRefsChildren);
-        }
-        else if(fqn.toString().equals(VERSION_REF_NODE))
-        {
-            children = this.getChildrenNames(loadVersionRefsChildren);
-        }
-        
-        if(children!=null)
-        {
-            children = Collections.unmodifiableSet(children);
-        }
-        
-        return children;
-    }
-    
-    /**
-     * 
-     */
-    public boolean exists(Fqn fqn) throws Exception 
-    {
-        boolean exists = false;
-        
-        //node calculation
-        String node = fqn.toString();
-        String nodeName = "";
-        int lastIndex = node.lastIndexOf('/');
-        if(lastIndex>0)
-        {
-            nodeName = node.substring(lastIndex+1);
-        }
-        String query = null;
-        
-        if(
-                node.equals("/") 
-        )
-        {
-            exists = true;
-            return exists;
-        }
-        else if(node.startsWith(WSP_PROP_NODE))
-        {
-            query = loadWSPProp;
-        }
-        else if(node.startsWith(VERSION_PROP_NODE))
-        {
-            query = loadVersionProp;
-        }
-        else if(node.startsWith(WSP_NODE_NODE))
-        {
-            query = loadWSPNode;
-        }
-        else if(node.startsWith(VERSION_NODE_NODE))
-        {
-            query = loadVersionNode;
-        }
-        else if(node.startsWith(WSP_REF_NODE))
-        {
-            query = loadWSPRef;
-        }
-        else if(node.startsWith(VERSION_REF_NODE))
-        {
-            query = loadVersionRef;
-        }
-        
-        if(query!=null && query.trim().length()>0)
-        {
-	        String id = PortalCMSCacheLoader.lookupNodeId(nodeName); 
-	        if(id!=null && id.trim().length()>0)
-	        {
-	            Object nodeValue = this.loadNode(query,id);
-	            if(nodeValue!=null)
-	            {
-	                exists = true;
-	            }	            
-	        }
-        }
-        
-        return exists;
-    }
+   /**
+    *
+    */
+   private static final String loadWSPNodes = "from org.jboss.portal.cms.hibernate.state.WSPNode";
+   private static final String loadWSPNodeChildren = "select node.nodeId from org.jboss.portal.cms.hibernate.state.WSPNode node";
+   private static final String loadWSPNode = "from org.jboss.portal.cms.hibernate.state.WSPNode node where node.nodeId=?";
+   private static final String loadVersionNodes = "from org.jboss.portal.cms.hibernate.state.VersionNode";
+   private static final String loadVersionNodeChildren = "select node.nodeId from org.jboss.portal.cms.hibernate.state.VersionNode node";
+   private static final String loadVersionNode = "from org.jboss.portal.cms.hibernate.state.VersionNode node where node.nodeId=?";
 
-    /**
-     * 
-     */
-    public Map get(Fqn fqn) throws Exception 
-    {
-        Map map = null;
-        
-        //node calculation
-        String node = fqn.toString();
-        String nodeName = "";
-        int lastIndex = node.lastIndexOf('/');
-        if(lastIndex>0)
-        {
-            nodeName = node.substring(lastIndex+1);
-        }
-        String query = null;
-                
-        if(node.startsWith(WSP_PROP_NODE))
-        {
-            query = loadWSPProp;
-        }
-        else if(node.startsWith(VERSION_PROP_NODE))
-        {   
-            query = loadVersionProp;
-        }
-        else if(node.startsWith(WSP_NODE_NODE))
-        {          
-            query = loadWSPNode;
-        }
-        else if(node.startsWith(VERSION_NODE_NODE))
-        {          
-            query = loadVersionNode;
-        }
-        else if(node.startsWith(WSP_REF_NODE))
-        {          
-            query = loadWSPRef;
-        }
-        else if(node.startsWith(VERSION_REF_NODE))
-        {          
-            query = loadVersionRef;
-        }
-        
-        if(query != null && query.trim().length()>0)
-        {
-            String id = PortalCMSCacheLoader.lookupNodeId(nodeName);
-            if(id !=null && id.trim().length()>0)
-            {
-	            Object nodeValue = this.loadNode(query,id);
-	            if(nodeValue!=null)
-	            {
-	                map = new HashMap();
-	                map.put(id,nodeValue);
-	            }	            
-            }
-        }
-        
-        return map;
-    }
+   /**
+    *
+    */
+   private static final String loadWSPRefs = "from org.jboss.portal.cms.hibernate.state.WSPRefs";
+   private static final String loadWSPRefsChildren = "select ref.refId from org.jboss.portal.cms.hibernate.state.WSPRefs ref";
+   private static final String loadWSPRef = "from org.jboss.portal.cms.hibernate.state.WSPRefs ref where ref.refId=?";
+   private static final String loadVersionRefs = "from org.jboss.portal.cms.hibernate.state.VersionRefs";
+   private static final String loadVersionRefsChildren = "select ref.refId from org.jboss.portal.cms.hibernate.state.VersionRefs ref";
+   private static final String loadVersionRef = "from org.jboss.portal.cms.hibernate.state.VersionRefs ref where ref.refId=?";
 
-    /**
-     * semantically, if the fqn node does not exist, the entire node needs to be created..
-     * In this cacheLoader's case, the node not existing in the database is not an option.
-     * that scenario never happens
-     * 
-     * returns the oldValue if its found or a new value is created
-     */
-    public Object put(Fqn fqn,Object key,Object value) throws Exception 
-    {
-        Object oldValue = null;
-        String node = fqn.toString();
-        
-        if(node.startsWith(WSP_PROP_NODE) && value instanceof WSPProp)
-        {
-            if(((Base)value).isPersistCacheItem())
+
+   /**
+    *
+    */
+   public static final String WSP_PROP_NODE = "/wsp_prop";
+   public static final String VERSION_PROP_NODE = "/version_prop";
+   public static final String WSP_NODE_NODE = "/wsp_node";
+   public static final String VERSION_NODE_NODE = "/version_node";
+   public static final String WSP_REF_NODE = "/wsp_ref";
+   public static final String VERSION_REF_NODE = "/version_ref";
+
+   /** map of propertyId-nodeName map */
+   private static Map nodeNames = Collections.synchronizedMap(new HashMap());
+
+   /**
+    *
+    */
+   private TreeCache cache = null;
+
+
+   /**
+    *
+    */
+   public void setConfig(Properties properties)
+   {
+   }
+
+   /**
+    *
+    */
+   public void setCache(TreeCache cache)
+   {
+      this.cache = cache;
+   }
+
+   /**
+    *
+    */
+   public Set getChildrenNames(Fqn fqn) throws Exception
+   {
+      Set children = null;
+
+      if (fqn.toString().equals("/"))
+      {
+         children = new HashSet();
+         children.add(WSP_PROP_NODE.substring(1));
+         children.add(VERSION_PROP_NODE.substring(1));
+         children.add(WSP_NODE_NODE.substring(1));
+         children.add(VERSION_NODE_NODE.substring(1));
+      }
+      else if (fqn.toString().equals(WSP_PROP_NODE))
+      {
+         children = this.getChildrenNames(loadWSPPropChildren);
+      }
+      else if (fqn.toString().equals(VERSION_PROP_NODE))
+      {
+         children = this.getChildrenNames(loadVersionPropChildren);
+      }
+      else if (fqn.toString().equals(WSP_NODE_NODE))
+      {
+         children = this.getChildrenNames(loadWSPNodeChildren);
+      }
+      else if (fqn.toString().equals(VERSION_NODE_NODE))
+      {
+         children = this.getChildrenNames(loadVersionNodeChildren);
+      }
+      else if (fqn.toString().equals(WSP_REF_NODE))
+      {
+         children = this.getChildrenNames(loadWSPRefsChildren);
+      }
+      else if (fqn.toString().equals(VERSION_REF_NODE))
+      {
+         children = this.getChildrenNames(loadVersionRefsChildren);
+      }
+
+      if (children != null)
+      {
+         children = Collections.unmodifiableSet(children);
+      }
+
+      return children;
+   }
+
+   /**
+    *
+    */
+   public boolean exists(Fqn fqn) throws Exception
+   {
+      boolean exists = false;
+
+      //node calculation
+      String node = fqn.toString();
+      String nodeName = "";
+      int lastIndex = node.lastIndexOf('/');
+      if (lastIndex > 0)
+      {
+         nodeName = node.substring(lastIndex + 1);
+      }
+      String query = null;
+
+      if (
+         node.equals("/")
+         )
+      {
+         exists = true;
+         return exists;
+      }
+      else if (node.startsWith(WSP_PROP_NODE))
+      {
+         query = loadWSPProp;
+      }
+      else if (node.startsWith(VERSION_PROP_NODE))
+      {
+         query = loadVersionProp;
+      }
+      else if (node.startsWith(WSP_NODE_NODE))
+      {
+         query = loadWSPNode;
+      }
+      else if (node.startsWith(VERSION_NODE_NODE))
+      {
+         query = loadVersionNode;
+      }
+      else if (node.startsWith(WSP_REF_NODE))
+      {
+         query = loadWSPRef;
+      }
+      else if (node.startsWith(VERSION_REF_NODE))
+      {
+         query = loadVersionRef;
+      }
+
+      if (query != null && query.trim().length() > 0)
+      {
+         String id = PortalCMSCacheLoader.lookupNodeId(nodeName);
+         if (id != null && id.trim().length() > 0)
+         {
+            Object nodeValue = this.loadNode(query, id);
+            if (nodeValue != null)
             {
-                oldValue = this.saveWSPPropNodeEntry((WSPProp)value);
+               exists = true;
             }
-            ((Base)value).resetCacheItemPersistence();
-        }
-        else if(node.startsWith(VERSION_PROP_NODE) && value instanceof VersionProp)
-        {
-            if(((Base)value).isPersistCacheItem())
-            {
-                oldValue = this.saveVersionPropNodeEntry((VersionProp)value);
-            }
-            ((Base)value).resetCacheItemPersistence();
-        }
-        else if(node.startsWith(WSP_NODE_NODE) && value instanceof WSPNode)
-        {
-            if(((Base)value).isPersistCacheItem())
-            {
-                oldValue = this.saveWSPNodeNodeEntry((WSPNode)value);
-            }
-            ((Base)value).resetCacheItemPersistence();
-        }
-        else if(node.startsWith(VERSION_NODE_NODE) && value instanceof VersionNode)
-        {
-            if(((Base)value).isPersistCacheItem())
-            {
-                oldValue = this.saveVersionNodeNodeEntry((VersionNode)value);
-            }
-            ((Base)value).resetCacheItemPersistence();
-        }
-        else if(node.startsWith(WSP_REF_NODE) && value instanceof WSPRefs)
-        {
-            if(((Base)value).isPersistCacheItem())
-            {
-                oldValue = this.saveWSPRefNodeEntry((WSPRefs)value);
-            }
-            ((Base)value).resetCacheItemPersistence();
-        }
-        else if(node.startsWith(VERSION_REF_NODE) && value instanceof VersionRefs)
-        {
-            if(((Base)value).isPersistCacheItem())
-            {
-                oldValue = this.saveVersionRefNodeEntry((VersionRefs)value);
-            }
-            ((Base)value).resetCacheItemPersistence();
-        }
-        
-        return oldValue;
-    }
+         }
+      }
 
-    /**
-     * 
-     */
-    public void put(Fqn fqn,Map attributes) throws Exception 
-    {
-        if(attributes!=null)
-        {
-            Set keys = attributes.keySet();
-            for(Iterator itr=keys.iterator();itr.hasNext();)
+      return exists;
+   }
+
+   /**
+    *
+    */
+   public Map get(Fqn fqn) throws Exception
+   {
+      Map map = null;
+
+      //node calculation
+      String node = fqn.toString();
+      String nodeName = "";
+      int lastIndex = node.lastIndexOf('/');
+      if (lastIndex > 0)
+      {
+         nodeName = node.substring(lastIndex + 1);
+      }
+      String query = null;
+
+      if (node.startsWith(WSP_PROP_NODE))
+      {
+         query = loadWSPProp;
+      }
+      else if (node.startsWith(VERSION_PROP_NODE))
+      {
+         query = loadVersionProp;
+      }
+      else if (node.startsWith(WSP_NODE_NODE))
+      {
+         query = loadWSPNode;
+      }
+      else if (node.startsWith(VERSION_NODE_NODE))
+      {
+         query = loadVersionNode;
+      }
+      else if (node.startsWith(WSP_REF_NODE))
+      {
+         query = loadWSPRef;
+      }
+      else if (node.startsWith(VERSION_REF_NODE))
+      {
+         query = loadVersionRef;
+      }
+
+      if (query != null && query.trim().length() > 0)
+      {
+         String id = PortalCMSCacheLoader.lookupNodeId(nodeName);
+         if (id != null && id.trim().length() > 0)
+         {
+            Object nodeValue = this.loadNode(query, id);
+            if (nodeValue != null)
             {
-                Object key = itr.next();
-                Object value = attributes.get(key);
-                this.put(fqn,key,value);
+               map = new HashMap();
+               map.put(id, nodeValue);
             }
-        }
-    }
+         }
+      }
 
-    /**
-     * 
-     */
-    public void put(List modifications) throws Exception 
-    {
-        if(modifications!=null)
-        {
-            for(int i = 0; i < modifications.size(); ++i)
+      return map;
+   }
+
+   /**
+    * semantically, if the fqn node does not exist, the entire node needs to be created.. In this cacheLoader's case,
+    * the node not existing in the database is not an option. that scenario never happens
+    * <p/>
+    * returns the oldValue if its found or a new value is created
+    */
+   public Object put(Fqn fqn, Object key, Object value) throws Exception
+   {
+      Object oldValue = null;
+      String node = fqn.toString();
+
+      if (node.startsWith(WSP_PROP_NODE) && value instanceof WSPProp)
+      {
+         if (((Base)value).isPersistCacheItem())
+         {
+            oldValue = this.saveWSPPropNodeEntry((WSPProp)value);
+         }
+         ((Base)value).resetCacheItemPersistence();
+      }
+      else if (node.startsWith(VERSION_PROP_NODE) && value instanceof VersionProp)
+      {
+         if (((Base)value).isPersistCacheItem())
+         {
+            oldValue = this.saveVersionPropNodeEntry((VersionProp)value);
+         }
+         ((Base)value).resetCacheItemPersistence();
+      }
+      else if (node.startsWith(WSP_NODE_NODE) && value instanceof WSPNode)
+      {
+         if (((Base)value).isPersistCacheItem())
+         {
+            oldValue = this.saveWSPNodeNodeEntry((WSPNode)value);
+         }
+         ((Base)value).resetCacheItemPersistence();
+      }
+      else if (node.startsWith(VERSION_NODE_NODE) && value instanceof VersionNode)
+      {
+         if (((Base)value).isPersistCacheItem())
+         {
+            oldValue = this.saveVersionNodeNodeEntry((VersionNode)value);
+         }
+         ((Base)value).resetCacheItemPersistence();
+      }
+      else if (node.startsWith(WSP_REF_NODE) && value instanceof WSPRefs)
+      {
+         if (((Base)value).isPersistCacheItem())
+         {
+            oldValue = this.saveWSPRefNodeEntry((WSPRefs)value);
+         }
+         ((Base)value).resetCacheItemPersistence();
+      }
+      else if (node.startsWith(VERSION_REF_NODE) && value instanceof VersionRefs)
+      {
+         if (((Base)value).isPersistCacheItem())
+         {
+            oldValue = this.saveVersionRefNodeEntry((VersionRefs)value);
+         }
+         ((Base)value).resetCacheItemPersistence();
+      }
+
+      return oldValue;
+   }
+
+   /**
+    *
+    */
+   public void put(Fqn fqn, Map attributes) throws Exception
+   {
+      if (attributes != null)
+      {
+         Set keys = attributes.keySet();
+         for (Iterator itr = keys.iterator(); itr.hasNext();)
+         {
+            Object key = itr.next();
+            Object value = attributes.get(key);
+            this.put(fqn, key, value);
+         }
+      }
+   }
+
+   /**
+    *
+    */
+   public void put(List modifications) throws Exception
+   {
+      if (modifications != null)
+      {
+         for (int i = 0; i < modifications.size(); ++i)
+         {
+            Modification m = (Modification)modifications.get(i);
+            switch (m.getType())
             {
-               Modification m = (Modification) modifications.get(i);
-               switch(m.getType())
-               {
-                  case Modification.PUT_DATA:
-                     put(m.getFqn(),m.getData());
-                     break;
-                  case Modification.PUT_DATA_ERASE:
-                     put(m.getFqn(), m.getData());
-                     break;
-                  case Modification.PUT_KEY_VALUE:
-                     put(m.getFqn(),m.getKey(),m.getValue());
-                     break;
-                  case Modification.REMOVE_DATA:
-                     removeData(m.getFqn());
-                     break;
-                  case Modification.REMOVE_KEY_VALUE:
-                     remove(m.getFqn(),m.getKey());
-                     break;
-                  case Modification.REMOVE_NODE:
-                     remove(m.getFqn());
-                     break;
-                  default:
-                     throw new IllegalStateException("Unexpected modification code: " + m.getType());
-               }
+               case Modification.PUT_DATA:
+                  put(m.getFqn(), m.getData());
+                  break;
+               case Modification.PUT_DATA_ERASE:
+                  put(m.getFqn(), m.getData());
+                  break;
+               case Modification.PUT_KEY_VALUE:
+                  put(m.getFqn(), m.getKey(), m.getValue());
+                  break;
+               case Modification.REMOVE_DATA:
+                  removeData(m.getFqn());
+                  break;
+               case Modification.REMOVE_KEY_VALUE:
+                  remove(m.getFqn(), m.getKey());
+                  break;
+               case Modification.REMOVE_NODE:
+                  remove(m.getFqn());
+                  break;
+               default:
+                  throw new IllegalStateException("Unexpected modification code: " + m.getType());
             }
-        }
-    }
+         }
+      }
+   }
 
-    /**
-     * 
-     */
-    public Object remove(Fqn fqn, Object key) throws Exception 
-    {
-        Object removedValue = null;
-        String node = fqn.toString();
-        String id = (String)key;
-        String query = null;
-        
-        
-        if(node.startsWith(WSP_PROP_NODE))
-        {
-            query = loadWSPProp;
-        }
-        else if(node.startsWith(VERSION_PROP_NODE))
-        {   
-            query = loadVersionProp;
-        }
-        else if(node.startsWith(WSP_NODE_NODE))
-        {          
-            query = loadWSPNode;
-        }
-        else if(node.startsWith(VERSION_NODE_NODE))
-        {          
-            query = loadVersionNode;
-        }
-        else if(node.startsWith(WSP_REF_NODE))
-        {          
-            query = loadWSPRef;
-        }
-        else if(node.startsWith(VERSION_REF_NODE))
-        {          
-            query = loadVersionRef;
-        }
-        
-        if(query != null && query.trim().length()>0)
-        {
-            removedValue = this.delete(query,id);
-        }
-        
-        return removedValue;
-    }
+   /**
+    *
+    */
+   public Object remove(Fqn fqn, Object key) throws Exception
+   {
+      Object removedValue = null;
+      String node = fqn.toString();
+      String id = (String)key;
+      String query = null;
 
-    /**
-     * 
-     */
-    public void remove(Fqn fqn) throws Exception 
-    {
-        //just for safety this is not implemented.
-        //the cache should not be used for this kind of stuff
-        
-        //the admin tool is suited for that
-    }
 
-    /**
-     * 
-     */
-    public void removeData(Fqn fqn) throws Exception 
-    {
-        //just for safety this is not implemented.
-        //the cache should not be used for this kind of stuff
-        
-        //the admin tool is suited for that
-    }
-    //------------cache unit of work transaction-management--------------------------------------------------------------------------------------------------------------------    
-    /**
-     * 
-     */
-    public void prepare(Object tx,List modifications,boolean one_phase) throws Exception 
-    {                
-        this.put(modifications);
-    }
+      if (node.startsWith(WSP_PROP_NODE))
+      {
+         query = loadWSPProp;
+      }
+      else if (node.startsWith(VERSION_PROP_NODE))
+      {
+         query = loadVersionProp;
+      }
+      else if (node.startsWith(WSP_NODE_NODE))
+      {
+         query = loadWSPNode;
+      }
+      else if (node.startsWith(VERSION_NODE_NODE))
+      {
+         query = loadVersionNode;
+      }
+      else if (node.startsWith(WSP_REF_NODE))
+      {
+         query = loadWSPRef;
+      }
+      else if (node.startsWith(VERSION_REF_NODE))
+      {
+         query = loadVersionRef;
+      }
 
-    /**
-     * 
-     */
-    public void commit(Object tx) throws Exception 
-    {                                             
-    }
+      if (query != null && query.trim().length() > 0)
+      {
+         removedValue = this.delete(query, id);
+      }
 
-    /**
-     * 
-     */
-    public void rollback(Object tx) 
-    {                               
-    }
-    //--------------------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public byte[] loadEntireState() throws Exception 
-    {
-        //loading the entire cms into a byteBuffer and sending it over the network to a remote cache
-        //is not feasible for this loader
-        //plus, all distributed caches/cache loaders will be loading/saving data to the same database
-        //so the content is in sync across all the caches in the cluster
-        return null;
-    }
+      return removedValue;
+   }
 
-    /**
-     * 
-     */
-    public void storeEntireState(byte[] arg0) throws Exception 
-    {
-        //no need for this since all the distributed caches/cacheloaders will be loading/saving data to the same
-        //database
-    }
-    //------Service lifecycle implementation---------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public void create() throws Exception 
-    {
-    }
+   /**
+    *
+    */
+   public void remove(Fqn fqn) throws Exception
+   {
+      //just for safety this is not implemented.
+      //the cache should not be used for this kind of stuff
 
-    /**
-     * 
-     */
-    public void start() throws Exception 
-    { 
-        log.debug("------------------------------------------------------");
-        log.debug("PersistenceManager Cache successfully started.....(ClusterName="+this.cache.getClusterName()+")");
-        log.debug("------------------------------------------------------");
-    }
+      //the admin tool is suited for that
+   }
 
-    /**
-     * 
-     */
-    public void stop() 
-    {
-        this.cache = null;
-    }
+   /**
+    *
+    */
+   public void removeData(Fqn fqn) throws Exception
+   {
+      //just for safety this is not implemented.
+      //the cache should not be used for this kind of stuff
 
-    /**
-     * 
-     */
-    public void destroy() 
-    {
-    }
-    //------internal implementation-----------------------------------------------------------------------------------------------------------------------                    
-    /**
-     * 
-     *
-     */
-    private Object saveWSPPropNodeEntry(WSPProp wspProp) throws Exception
-    {
-        Object oldValue = null;
-        
-        oldValue = this.loadManagedNode(loadWSPProp,wspProp.getPropId());
-        if(oldValue!=null)
-        {
-            Integer id = ((WSPProp)oldValue).getKey();
-            wspProp.setKey(id);
-        }
-        else
-        {
-            wspProp.setKey(null);
-        }
-        this.save(wspProp);
-        
-        return oldValue;
-    }
-        
-    /**
-     * 
-     *
-     */
-    private Object saveVersionPropNodeEntry(VersionProp versionProp) throws Exception
-    {
-        Object oldValue = null;
-        
-        oldValue = this.loadManagedNode(loadVersionProp,versionProp.getPropId());
-        if(oldValue!=null)
-        {
-            Integer id = ((VersionProp)oldValue).getKey();
-            versionProp.setKey(id);
-        }
-        else
-        {
-            versionProp.setKey(null);
-        }
-        this.save(versionProp);
-        
-        return oldValue;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object saveWSPNodeNodeEntry(WSPNode wspNode) throws Exception
-    {
-        Object oldValue = null;
-        
-        oldValue = this.loadManagedNode(loadWSPNode,wspNode.getNodeId());
-        if(oldValue!=null)
-        {
-            Integer id = ((WSPNode)oldValue).getKey();
-            wspNode.setKey(id);
-        }
-        else
-        {
-            wspNode.setKey(null);
-        }
-        this.save(wspNode);
-        
-        return oldValue;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object saveVersionNodeNodeEntry(VersionNode versionNode) throws Exception
-    {
-        Object oldValue = null;
-        
-        oldValue = this.loadManagedNode(loadVersionNode,versionNode.getNodeId());
-        if(oldValue!=null)
-        {
-            Integer id = ((VersionNode)oldValue).getKey();
-            versionNode.setKey(id);
-        }
-        else
-        {
-            versionNode.setKey(null);
-        }
-        this.save(versionNode);
-        
-        return oldValue;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object saveWSPRefNodeEntry(WSPRefs wspRef) throws Exception
-    {
-        Object oldValue = null;
-        
-        oldValue = this.loadManagedNode(loadWSPRef,wspRef.getRefId());
-        if(oldValue!=null)
-        {
-            Integer id = ((WSPRefs)oldValue).getKey();
-            wspRef.setKey(id);
-        }
-        else
-        {
-            wspRef.setKey(null);
-        }
-        this.save(wspRef);
-        
-        return oldValue;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object saveVersionRefNodeEntry(VersionRefs versionRef) throws Exception
-    {
-        Object oldValue = null;
-        
-        oldValue = this.loadManagedNode(loadVersionRef,versionRef.getRefId());
-        if(oldValue!=null)
-        {
-            Integer id = ((VersionRefs)oldValue).getKey();
-            versionRef.setKey(id);
-        }
-        else
-        {
-            versionRef.setKey(null);
-        }
-        this.save(versionRef);
-        
-        return oldValue;
-    }
-    //-----------------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     *
-     */
-    private Set getChildrenNames(String query) throws Exception
-    {
-        Set children = null;
-        Session session = null;
-        try
-        {
-            session = Tools.getOpenSession();
-            
-            List rs = session.createQuery(query).list();
-            for(Iterator itr=rs.iterator();itr.hasNext();)
+      //the admin tool is suited for that
+   }
+
+   //------------cache unit of work transaction-management--------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    */
+   public void prepare(Object tx, List modifications, boolean one_phase) throws Exception
+   {
+      this.put(modifications);
+   }
+
+   /**
+    *
+    */
+   public void commit(Object tx) throws Exception
+   {
+   }
+
+   /**
+    *
+    */
+   public void rollback(Object tx)
+   {
+   }
+
+   //--------------------------------------------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    */
+   public byte[] loadEntireState() throws Exception
+   {
+      //loading the entire cms into a byteBuffer and sending it over the network to a remote cache
+      //is not feasible for this loader
+      //plus, all distributed caches/cache loaders will be loading/saving data to the same database
+      //so the content is in sync across all the caches in the cluster
+      return null;
+   }
+
+   /**
+    *
+    */
+   public void storeEntireState(byte[] arg0) throws Exception
+   {
+      //no need for this since all the distributed caches/cacheloaders will be loading/saving data to the same
+      //database
+   }
+
+   //------Service lifecycle implementation---------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    */
+   public void create() throws Exception
+   {
+   }
+
+   /**
+    *
+    */
+   public void start() throws Exception
+   {
+      log.debug("------------------------------------------------------");
+      log.debug("PersistenceManager Cache successfully started.....(ClusterName=" + this.cache.getClusterName() + ")");
+      log.debug("------------------------------------------------------");
+   }
+
+   /**
+    *
+    */
+   public void stop()
+   {
+      this.cache = null;
+   }
+
+   /**
+    *
+    */
+   public void destroy()
+   {
+   }
+
+   //------internal implementation-----------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    *
+    */
+   private Object saveWSPPropNodeEntry(WSPProp wspProp) throws Exception
+   {
+      Object oldValue = null;
+
+      oldValue = this.loadManagedNode(loadWSPProp, wspProp.getPropId());
+      if (oldValue != null)
+      {
+         Integer id = ((WSPProp)oldValue).getKey();
+         wspProp.setKey(id);
+      }
+      else
+      {
+         wspProp.setKey(null);
+      }
+      this.save(wspProp);
+
+      return oldValue;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object saveVersionPropNodeEntry(VersionProp versionProp) throws Exception
+   {
+      Object oldValue = null;
+
+      oldValue = this.loadManagedNode(loadVersionProp, versionProp.getPropId());
+      if (oldValue != null)
+      {
+         Integer id = ((VersionProp)oldValue).getKey();
+         versionProp.setKey(id);
+      }
+      else
+      {
+         versionProp.setKey(null);
+      }
+      this.save(versionProp);
+
+      return oldValue;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object saveWSPNodeNodeEntry(WSPNode wspNode) throws Exception
+   {
+      Object oldValue = null;
+
+      oldValue = this.loadManagedNode(loadWSPNode, wspNode.getNodeId());
+      if (oldValue != null)
+      {
+         Integer id = ((WSPNode)oldValue).getKey();
+         wspNode.setKey(id);
+      }
+      else
+      {
+         wspNode.setKey(null);
+      }
+      this.save(wspNode);
+
+      return oldValue;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object saveVersionNodeNodeEntry(VersionNode versionNode) throws Exception
+   {
+      Object oldValue = null;
+
+      oldValue = this.loadManagedNode(loadVersionNode, versionNode.getNodeId());
+      if (oldValue != null)
+      {
+         Integer id = ((VersionNode)oldValue).getKey();
+         versionNode.setKey(id);
+      }
+      else
+      {
+         versionNode.setKey(null);
+      }
+      this.save(versionNode);
+
+      return oldValue;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object saveWSPRefNodeEntry(WSPRefs wspRef) throws Exception
+   {
+      Object oldValue = null;
+
+      oldValue = this.loadManagedNode(loadWSPRef, wspRef.getRefId());
+      if (oldValue != null)
+      {
+         Integer id = ((WSPRefs)oldValue).getKey();
+         wspRef.setKey(id);
+      }
+      else
+      {
+         wspRef.setKey(null);
+      }
+      this.save(wspRef);
+
+      return oldValue;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object saveVersionRefNodeEntry(VersionRefs versionRef) throws Exception
+   {
+      Object oldValue = null;
+
+      oldValue = this.loadManagedNode(loadVersionRef, versionRef.getRefId());
+      if (oldValue != null)
+      {
+         Integer id = ((VersionRefs)oldValue).getKey();
+         versionRef.setKey(id);
+      }
+      else
+      {
+         versionRef.setKey(null);
+      }
+      this.save(versionRef);
+
+      return oldValue;
+   }
+
+   //-----------------------------------------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    *
+    */
+   private Set getChildrenNames(String query) throws Exception
+   {
+      Set children = null;
+      Session session = null;
+      try
+      {
+         session = Tools.getOpenSession();
+
+         List rs = session.createQuery(query).list();
+         for (Iterator itr = rs.iterator(); itr.hasNext();)
+         {
+            String id = (String)itr.next();
+            if (children == null)
             {
-                String id = (String)itr.next();   
-                if(children==null)
-                {
-                    children = new HashSet();
-                }
-                children.add(PortalCMSCacheLoader.parseNodeName(id));
+               children = new HashSet();
             }
-        }
-        finally
-        {
-            Tools.closeSession(session);
-        }
-        return children;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object loadNode(String query,String id) throws Exception
-    {
-        Object node = null;
-        Session session = null;
-        try
-        {
-            session = Tools.getOpenSession();
-            
-            //node = session.createQuery(query).setString(0,id).uniqueResult();
-            List rs = session.createQuery(query).setString(0,id).list();
-            if(rs !=null && !rs.isEmpty())
-            {
-                node = rs.iterator().next();
-            }
-        }
-        finally
-        {
-            Tools.closeSession(session);
-        }
-        return node;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object loadManagedNode(String query,String id) throws Exception
-    {
-        Object node = null;
-        
-        Session session = Tools.getCurrentSession();        
-        //node = session.createQuery(query).setString(0,id).uniqueResult();
-        List rs = session.createQuery(query).setString(0,id).list();
-        if(rs !=null && !rs.isEmpty())
-        {
+            children.add(PortalCMSCacheLoader.parseNodeName(id));
+         }
+      }
+      finally
+      {
+         Tools.closeSession(session);
+      }
+      return children;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object loadNode(String query, String id) throws Exception
+   {
+      Object node = null;
+      Session session = null;
+      try
+      {
+         session = Tools.getOpenSession();
+
+         //node = session.createQuery(query).setString(0,id).uniqueResult();
+         List rs = session.createQuery(query).setString(0, id).list();
+         if (rs != null && !rs.isEmpty())
+         {
             node = rs.iterator().next();
-        }
-                
-        return node;
-    }
-    
-    /**
-     * 
-     */
-    private void save(Object object) throws Exception
-    {
-        Session session = Tools.getCurrentSession();
-        if(((Base)object).getKey() != null)
-        {
-            session.merge(object);
-        }
-        else
-        {
-            session.save(object);
-        }
-    }
-    
-    /**
-     * 
-     *
-     */
-    private Object delete(String loadQuery,String id) throws Exception
-    {
-        Object removedValue = null;
-        removedValue = this.loadManagedNode(loadQuery,id);
-        if(removedValue!=null)
-        {
-            Session session = Tools.getCurrentSession();            
-            session.delete(removedValue);            
-        }
-        return removedValue;
-    }
-    //---------------nodeName related methods-------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     *
-     */
-    public static String parseNodeName(String id)
-    {
-        String node = (String)PortalCMSCacheLoader.nodeNames.get(id);
-        
-        if(node == null)
-        {
-            node = id.replace('/','_');
-            node = node.replace(':','_');
-            node = node.replace('{','_');
-            node = node.replace('}','_');
-            PortalCMSCacheLoader.nodeNames.put(id,node);
-        }
-        
-        return node;
-    }
-    
-    /**
-     * 
-     *
-     */
-    private static String lookupNodeId(String nodeName)
-    {
-       String id = null;
-       
-       Object[] keys = PortalCMSCacheLoader.nodeNames.keySet().toArray();
-       for(int i=0;i<keys.length;i++)
-       {
-           String key = (String)keys[i];
-           String value = (String)PortalCMSCacheLoader.nodeNames.get(key);
-           if(value.equals(nodeName))
-           {
-               id = key;
-               break;
-           }
-       }
-       
-       return id;
-    }
+         }
+      }
+      finally
+      {
+         Tools.closeSession(session);
+      }
+      return node;
+   }
+
+   /**
+    *
+    *
+    */
+   private Object loadManagedNode(String query, String id) throws Exception
+   {
+      Object node = null;
+
+      Session session = Tools.getCurrentSession();
+      //node = session.createQuery(query).setString(0,id).uniqueResult();
+      List rs = session.createQuery(query).setString(0, id).list();
+      if (rs != null && !rs.isEmpty())
+      {
+         node = rs.iterator().next();
+      }
+
+      return node;
+   }
+
+   /**
+    *
+    */
+   private void save(Object object) throws Exception
+   {
+      Session session = Tools.getCurrentSession();
+      if (((Base)object).getKey() != null)
+      {
+         session.merge(object);
+      }
+      else
+      {
+         session.save(object);
+      }
+   }
+
+   /**
+    *
+    *
+    */
+   private Object delete(String loadQuery, String id) throws Exception
+   {
+      Object removedValue = null;
+      removedValue = this.loadManagedNode(loadQuery, id);
+      if (removedValue != null)
+      {
+         Session session = Tools.getCurrentSession();
+         session.delete(removedValue);
+      }
+      return removedValue;
+   }
+
+   //---------------nodeName related methods-------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    *
+    */
+   public static String parseNodeName(String id)
+   {
+      String node = (String)PortalCMSCacheLoader.nodeNames.get(id);
+
+      if (node == null)
+      {
+         node = id.replace('/', '_');
+         node = node.replace(':', '_');
+         node = node.replace('{', '_');
+         node = node.replace('}', '_');
+         PortalCMSCacheLoader.nodeNames.put(id, node);
+      }
+
+      return node;
+   }
+
+   /**
+    *
+    *
+    */
+   private static String lookupNodeId(String nodeName)
+   {
+      String id = null;
+
+      Object[] keys = PortalCMSCacheLoader.nodeNames.keySet().toArray();
+      for (int i = 0; i < keys.length; i++)
+      {
+         String key = (String)keys[i];
+         String value = (String)PortalCMSCacheLoader.nodeNames.get(key);
+         if (value.equals(nodeName))
+         {
+            id = key;
+            break;
+         }
+      }
+
+      return id;
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
-import javax.naming.InitialContext;
-
 import org.apache.log4j.Logger;
-
-import org.hibernate.cfg.Configuration;
+import org.hibernate.HibernateException;
+import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.Query;
-import org.hibernate.HibernateException;
+import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.hibernate.Transaction;
 
+import javax.naming.InitialContext;
+
 /*
  * Created on Aug 29, 2006
  * 
@@ -41,159 +41,145 @@
  *
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
  */
-public class Tools 
+public class Tools
 {
-	private static final Logger log = Logger.getLogger(Tools.class);
-	
-	//hibernate configuration relation information
-	private static SessionFactory sessionFactory = null;
-	private static Configuration cfg = null;
-	private static boolean autoClose = false;
-		
-    /**
-     * 
-     *
-     */
-	public static void init(String jndiName)
-	{
-	    if(Tools.sessionFactory == null)
-	    {	        
-			try
-			{
-			    log.debug("Loading the PersistenceManager Hibernate System (Started)...........................");
-			    
-			    boolean loadSuccess = true;
-			    try
-			    {
-			        //just to initialize the session factory
-			        Tools.sessionFactory = (SessionFactory)new InitialContext().lookup(jndiName);
-			    }
-			    catch(Exception e)
-			    {
-			        //some reason this is not found in JNDI environment....try and load from hibernate.cfg.xml from 
-			        //classpath
-			        loadSuccess = false;
-			    }
-			    
-			    if(!loadSuccess)
-			    {
-				    //configure session factory from configuration
-				    Tools.cfg = new Configuration();
-					Tools.cfg.configure();
-					Tools.sessionFactory = Tools.cfg.buildSessionFactory();
-					Tools.generateSiteSchema(Tools.cfg);
-			    }
-				
-				
-				log.debug("Loading the PersistenceManager Hibernate System (Done)...........................");
-			}
-			catch(Exception e)
-			{
-				log.error("org.jboss.portal.cms.hibernate.state.Tools",e);
-			}			
-	    }
-	}
-    
-    //---------------------------------------------------------------------------------------------------------------------------------------------------
-	/**
-	 * 
-	 */
-	public static SessionFactory getSessionFactory()
-	{
-	    return Tools.sessionFactory;
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	public static Session getCurrentSession()
-	{        
-		Session session = Tools.sessionFactory.getCurrentSession();
-		return session;
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	public static Session getOpenSession()
-	{        
-		Session session = Tools.sessionFactory.openSession();
-		return session;
-	}
-	
-	/**
-     * 
-     * @param session
-	 */	
-	public static void closeSession(Session session)
-	{
-		if(session!=null && session.isOpen() && !Tools.autoClose)
-		{
-		    session.close();
-		}
-	}
-	//-----------------------schema generation capabilities-------------------------------------------------------------------------------------------
-	/**
-     * 
-     * @param cfg
-	 */	
-	private static void generateSiteSchema(Configuration cfg)	
-	{				
-		if(!doesSiteSchemaExist())
-		{
-			SchemaExport export = new SchemaExport(cfg);
-			export.create(true, //print to the console
-					true //run inside the database
-			);
-		}
-		else
-		{
-			log.info("Site Schema successfully found....No need to recreate it.");
-		}
-	}
-	
-    /**
-     * 
-     * @return
-     */
-	private static boolean doesSiteSchemaExist()
-	{		
-		Session session = null;
-		Transaction tx = null;
-        try
-        {
-	         session = Tools.sessionFactory.openSession();
-	         tx = session.beginTransaction();
-	         ClassMetadata cmd = (ClassMetadata)Tools.sessionFactory.getAllClassMetadata().values().iterator().next();
-	         if(cmd!=null)
-	         {
-	             Query query = session.createQuery("from " + cmd.getEntityName());
-	             query.setFirstResult(0);
-	             query.setMaxResults(0);
-		         try
-		         {
-		               query.list();
-		         }
-	             catch (HibernateException e)
-	             {
-	               // We consider that exception means that the schema deos not exist
-	               return false;               
-	             }
-	         }             
-             //if I get here the schemaExists, dont recreate it
-             return true;
-        }
-        finally
-        {
-        	if(tx!=null)
-        	{
-        		tx.rollback(); //does not matter since this is only a read operation
-        		//this is only so that this operation executes within the context
-        		//of a transaction that performs any necessary cleanup automatically
-        	}
-        	Tools.closeSession(session);        	
-        }		
-	}
+   private static final Logger log = Logger.getLogger(Tools.class);
+
+   //hibernate configuration relation information
+   private static SessionFactory sessionFactory = null;
+   private static Configuration cfg = null;
+   private static boolean autoClose = false;
+
+   /**
+    *
+    *
+    */
+   public static void init(String jndiName)
+   {
+      if (Tools.sessionFactory == null)
+      {
+         try
+         {
+            log.debug("Loading the PersistenceManager Hibernate System (Started)...........................");
+
+            boolean loadSuccess = true;
+            try
+            {
+               //just to initialize the session factory
+               Tools.sessionFactory = (SessionFactory)new InitialContext().lookup(jndiName);
+            }
+            catch (Exception e)
+            {
+               //some reason this is not found in JNDI environment....try and load from hibernate.cfg.xml from
+               //classpath
+               loadSuccess = false;
+            }
+
+            if (!loadSuccess)
+            {
+               //configure session factory from configuration
+               Tools.cfg = new Configuration();
+               Tools.cfg.configure();
+               Tools.sessionFactory = Tools.cfg.buildSessionFactory();
+               Tools.generateSiteSchema(Tools.cfg);
+            }
+
+
+            log.debug("Loading the PersistenceManager Hibernate System (Done)...........................");
+         }
+         catch (Exception e)
+         {
+            log.error("org.jboss.portal.cms.hibernate.state.Tools", e);
+         }
+      }
+   }
+
+   //---------------------------------------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    */
+   public static SessionFactory getSessionFactory()
+   {
+      return Tools.sessionFactory;
+   }
+
+   /** @return  */
+   public static Session getCurrentSession()
+   {
+      Session session = Tools.sessionFactory.getCurrentSession();
+      return session;
+   }
+
+   /** @return  */
+   public static Session getOpenSession()
+   {
+      Session session = Tools.sessionFactory.openSession();
+      return session;
+   }
+
+   /** @param session  */
+   public static void closeSession(Session session)
+   {
+      if (session != null && session.isOpen() && !Tools.autoClose)
+      {
+         session.close();
+      }
+   }
+
+   //-----------------------schema generation capabilities-------------------------------------------------------------------------------------------
+   /** @param cfg  */
+   private static void generateSiteSchema(Configuration cfg)
+   {
+      if (!doesSiteSchemaExist())
+      {
+         SchemaExport export = new SchemaExport(cfg);
+         export.create(true, //print to the console
+            true //run inside the database
+         );
+      }
+      else
+      {
+         log.info("Site Schema successfully found....No need to recreate it.");
+      }
+   }
+
+   /** @return  */
+   private static boolean doesSiteSchemaExist()
+   {
+      Session session = null;
+      Transaction tx = null;
+      try
+      {
+         session = Tools.sessionFactory.openSession();
+         tx = session.beginTransaction();
+         ClassMetadata cmd = (ClassMetadata)Tools.sessionFactory.getAllClassMetadata().values().iterator().next();
+         if (cmd != null)
+         {
+            Query query = session.createQuery("from " + cmd.getEntityName());
+            query.setFirstResult(0);
+            query.setMaxResults(0);
+            try
+            {
+               query.list();
+            }
+            catch (HibernateException e)
+            {
+               // We consider that exception means that the schema deos not exist
+               return false;
+            }
+         }
+         //if I get here the schemaExists, dont recreate it
+         return true;
+      }
+      finally
+      {
+         if (tx != null)
+         {
+            tx.rollback(); //does not matter since this is only a read operation
+            //this is only so that this operation executes within the context
+            //of a transaction that performs any necessary cleanup automatically
+         }
+         Tools.closeSession(session);
+      }
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionBinVal.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
 import java.sql.Blob;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class VersionBinVal implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -5293395795569121306L;
-   
+
    private Integer key;
    private String id;
    private java.sql.Blob data;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionNode.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
-import java.sql.Blob;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class VersionNode extends Base implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -2699419131858972327L;
-   
+
    private String nodeId;
    private byte[] data;
 
@@ -45,7 +43,7 @@
       this.data = data;
    }
 
-   
+
    public String getNodeId()
    {
       return nodeId;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionProp.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
-import java.sql.Blob;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class VersionProp extends Base implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -699585138297339148L;
-   
+
    private String propId;
    private byte[] data;
 
@@ -45,7 +43,7 @@
       this.data = data;
    }
 
-   
+
    public String getPropId()
    {
       return propId;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/VersionRefs.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class VersionRefs extends Base implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -4096847492469682729L;
-   
+
    private String refId;
    private byte[] data;
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPBinVal.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
 import java.sql.Blob;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class WSPBinVal implements Serializable
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -6052991380871814524L;
-   
+
    private Integer key;
    private String id;
    private java.sql.Blob data;

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPNode.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
-import java.sql.Blob;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class WSPNode extends Base implements Serializable
 {
    /** The serialVersionUID */

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPProp.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
-import java.sql.Blob;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class WSPProp extends Base implements Serializable
 {
    /** The serialVersionUID */

Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/WSPRefs.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.hibernate.state;
 
 import java.io.Serializable;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class WSPRefs extends Base implements Serializable
 {
    /** The serialVersionUID */
@@ -37,13 +36,13 @@
    {
    }
 
-   public WSPRefs(String refId,byte[] data)
+   public WSPRefs(String refId, byte[] data)
    {
       this.refId = refId;
       this.data = data;
    }
 
-  
+
    public String getRefId()
    {
       return this.refId;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/CMSCacheException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl;
 
 import org.jboss.cache.CacheException;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/CMSObjectImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl;
 
 import org.jboss.portal.cms.model.CMSObject;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/CMSTreeCacheService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,59 +1,58 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl;
 
-import java.util.Locale;
-
 import org.jboss.portal.cms.model.File;
 
+import java.util.Locale;
+
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  * @version $Revision$
  */
 public interface CMSTreeCacheService
 {
-   
+
    public static String JNDIName = "java:/portal/cms/CMSTreeCache";
-   
-   /**
-    * Get a file from the cache, returns null if the file cannot be found
-    */
+
+   /** Get a file from the cache, returns null if the file cannot be found */
    public File get(String path, Locale locale);
-   
-   /**
-    * Put a CMS file into the cache
-    */
+
+   /** Put a CMS file into the cache */
    public void put(String path, Locale locale, File file);
-   
+
    /**
     * Remove a localized file
-    * @throws CacheException 
+    *
+    * @throws CacheException
     */
    public void remove(String path, Locale locale) throws CMSCacheException;
 
    /**
     * Remove a file (all languages)
-    * @throws CacheException 
+    *
+    * @throws CacheException
     */
    public void remove(String path) throws CMSCacheException;
-   
+
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/ContentImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl;
 
 
@@ -99,17 +100,13 @@
       this.versionNumber = versionNumber;
    }
 
-   /**
-    * @return Returns the content.
-    */
+   /** @return Returns the content. */
    public InputStream getStream()
    {
       return new ByteArrayInputStream(bytes);
    }
 
-   /**
-    * @return Returns the content.
-    */
+   /** @return Returns the content. */
    public byte[] getBytes()
    {
       return bytes;
@@ -117,46 +114,38 @@
 
    public String getContentAsString()
    {
-      if(encoding != null)
+      if (encoding != null)
       {
          try
          {
             return new String(bytes, encoding);
          }
-         catch(UnsupportedEncodingException e)
+         catch (UnsupportedEncodingException e)
          {
          }
       }
       return new String(bytes);
    }
 
-   /**
-    * @param stream The content to set.
-    */
+   /** @param stream The content to set. */
    public void setStream(InputStream stream)
    {
       bytes = FileUtil.getBytes(stream);
    }
 
-   /**
-    * @param bytes The content to set.
-    */
+   /** @param bytes The content to set. */
    public void setBytes(byte[] bytes)
    {
       this.bytes = bytes;
    }
 
-   /**
-    * @return Returns the encoding.
-    */
+   /** @return Returns the encoding. */
    public String getEncoding()
    {
       return encoding;
    }
 
-   /**
-    * @param encoding The encoding to set.
-    */
+   /** @param encoding The encoding to set. */
    public void setEncoding(String encoding)
    {
       this.encoding = encoding;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/FileImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl;
 
 
@@ -28,9 +29,7 @@
 import java.io.Serializable;
 import java.util.Locale;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public class FileImpl extends CMSObjectImpl implements File, Serializable
 {
    /** The serialVersionUID */

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/FolderImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl;
 
 import org.jboss.portal.cms.model.Folder;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.cache;
 
-import java.util.Locale;
-
 import org.jboss.cache.CacheException;
 import org.jboss.cache.TreeCacheMBean;
 import org.jboss.logging.Logger;
 import org.jboss.portal.cms.impl.CMSCacheException;
 import org.jboss.portal.cms.impl.CMSTreeCacheService;
 import org.jboss.portal.cms.model.File;
+import org.jboss.portal.common.util.JNDI;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.common.util.JNDI;
 
+import java.util.Locale;
+
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  * @version $Revision$
@@ -39,17 +40,17 @@
 public class CMSTreeCacheServiceImpl extends AbstractJBossService implements CMSTreeCacheService
 {
    private TreeCacheMBean cache;
-   
+
    private Logger log = Logger.getLogger(CMSTreeCacheServiceImpl.class);
 
    private String jndiName;
-   
+
    protected JNDI.Binding jndiBinding;
 
    public CMSTreeCacheServiceImpl()
    {
    }
-   
+
    public String getJNDIName()
    {
       return jndiName;
@@ -59,7 +60,7 @@
    {
       this.jndiName = jndiName;
    }
-   
+
    public File get(String path, Locale locale)
    {
       if (path == null)
@@ -73,7 +74,7 @@
       try
       {
          File file = (File)cache.get(path, locale);
-         if (file !=null && log.isDebugEnabled())
+         if (file != null && log.isDebugEnabled())
          {
             log.debug("File " + path + " taken from cache for locale " + locale.getCountry() + "/" + locale.getLanguage());
          }
@@ -145,20 +146,20 @@
          throw new CMSCacheException(e);
       }
    }
-   
+
    public void startService()
    {
       try
       {
          log.info("Starting CMS cache service");
-         
+
          //
          if (jndiName != null)
          {
             jndiBinding = new JNDI.Binding(jndiName, this);
             jndiBinding.bind();
          }
-         
+
          log.info("CMS cache service started");
       }
       catch (Exception e)
@@ -177,15 +178,15 @@
          jndiBinding.unbind();
          jndiBinding = null;
       }
-      
+
       log.info("CMS cache service stopped");
    }
-   
+
    public TreeCacheMBean getCache()
    {
       return cache;
    }
-   
+
    public void setCache(TreeCacheMBean cache)
    {
       this.cache = cache;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.interceptors;
 
-import java.util.Locale;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
 import org.jboss.logging.Logger;
 import org.jboss.portal.cms.CMSInterceptor;
 import org.jboss.portal.cms.impl.CMSCacheException;
@@ -37,9 +33,11 @@
 import org.jboss.portal.cms.model.File;
 import org.jboss.portal.common.invocation.InvocationException;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.Locale;
+
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public class CacheInterceptor extends CMSInterceptor
 {
 
@@ -53,7 +51,7 @@
       try
       {
          InitialContext ic = new InitialContext();
-         cache = (CMSTreeCacheService) ic.lookup(CMSTreeCacheService.JNDIName);
+         cache = (CMSTreeCacheService)ic.lookup(CMSTreeCacheService.JNDIName);
       }
       catch (NamingException e)
       {

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/interceptors/LogInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.interceptors;
 
-import java.util.Date;
-
 import org.jboss.portal.cms.CMSInterceptor;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.common.invocation.InvocationException;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+import java.util.Date;
+
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public class LogInterceptor extends CMSInterceptor
 {
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCMS.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,47 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Locale;
-
-import javax.jcr.Repository;
-import javax.jcr.Session;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
+import org.jboss.cache.Version;
 import org.jboss.portal.cms.CMS;
+import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.CMSMimeMappings;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.CommandFactory;
-import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
 import org.jboss.portal.cms.impl.FolderImpl;
@@ -50,21 +38,32 @@
 import org.jboss.portal.cms.model.File;
 import org.jboss.portal.cms.model.Folder;
 import org.jboss.portal.cms.util.RepositoryUtil;
+import org.jboss.portal.common.invocation.InterceptorStackFactory;
+import org.jboss.portal.common.invocation.Invocation;
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.common.invocation.InvocationHandler;
 import org.jboss.portal.common.net.URLNavigator;
 import org.jboss.portal.common.net.URLVisitor;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.XML;
-import org.jboss.portal.common.invocation.InterceptorStackFactory;
-import org.jboss.portal.common.invocation.InvocationHandler;
-import org.jboss.portal.common.invocation.Invocation;
-import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.util.StopWatch;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import org.jboss.cache.Version;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Locale;
 
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
@@ -86,12 +85,12 @@
 
    private String homeDir;
    private String repositoryName;
-   
+
    private InterceptorStackFactory stackFactory;
-   
+
    private Element config;
-      
 
+
    private InvocationHandler handler = new InvocationHandler()
    {
       public Object invoke(Invocation invocation) throws Exception, InvocationException
@@ -171,22 +170,19 @@
       this.doChecking = doChecking;
    }
 
-   /**
-    * CMS Start
-    */
+   /** CMS Start */
    public void startService() throws Exception
    {
-       //check the version of jbosscache being run
-       String cacheVersion = Version.getVersionString(Version.getVersionShort());
-       log.info("JBossCache Version="+cacheVersion);
-       
-       //set the proper logging level for JBossCache and JGroups
-       Logger cacheLogger = Logger.getLogger("org.jboss.cache");
-       cacheLogger.setLevel(Level.ERROR);
-       Logger groupsLogger = Logger.getLogger("org.jgroups");
-       groupsLogger.setLevel(Level.ERROR);
-       
-       
+      //check the version of jbosscache being run
+      String cacheVersion = Version.getVersionString(Version.getVersionShort());
+      log.info("JBossCache Version=" + cacheVersion);
+
+      //set the proper logging level for JBossCache and JGroups
+      Logger cacheLogger = Logger.getLogger("org.jboss.cache");
+      cacheLogger.setLevel(Level.ERROR);
+      Logger groupsLogger = Logger.getLogger("org.jgroups");
+      groupsLogger.setLevel(Level.ERROR);
+
       // See how long it takes us to start up
       StopWatch watch = new StopWatch(true);
       log.info("Starting JCR CMS");
@@ -197,10 +193,7 @@
    }
 
 
-   /**
-    * Shuts down the repo and unregisters it
-    *
-    */
+   /** Shuts down the repo and unregisters it */
    public void stopService()
    {
       log.info("Stopping JCR CMS");
@@ -213,7 +206,7 @@
       // Serialize the embedded configuration
       DOMImplementation impl = config.getOwnerDocument().getImplementation();
       Document doc = impl.createDocument("tmp", "tmp", null);
-      Element copy = (Element) doc.importNode(config, true);
+      Element copy = (Element)doc.importNode(config, true);
       doc.removeChild(doc.getDocumentElement());
       doc.appendChild(copy);
       String result = XML.toString(doc);
@@ -231,10 +224,10 @@
       Logger.getLogger("org.apache.jackrabbit").setLevel(Level.ERROR);
 
       //
-      if(doChecking)
+      if (doChecking)
       {
          // Check default content exists.
-         if(!contentExists())
+         if (!contentExists())
          {
             createContent();
          }
@@ -267,11 +260,8 @@
       }
    }
 
-//   /**
-   /**
-    * Loads content from sar and adds it to the repo.
-    *
-    */
+   //   /**
+   /** Loads content from sar and adds it to the repo. */
    public void createContent() throws IOException
    {
       log.info("Creating default CMS content.");
@@ -284,6 +274,7 @@
       {
          // Handle the name atoms
          LinkedList atoms = new LinkedList();
+
          public void startDir(URL url, String name)
          {
             // Compute the uri for the folder
@@ -320,10 +311,12 @@
 
             atoms.addLast(name);
          }
+
          public void endDir(URL url, String name)
          {
             atoms.removeLast();
          }
+
          public void file(URL url, String name)
          {
             InputStream in = null;
@@ -333,7 +326,7 @@
 
                // Compute the uri of the file
                Iterator iterator = atoms.iterator();
-               while(iterator.hasNext())
+               while (iterator.hasNext())
                {
                   String atom = (String)iterator.next();
                   tmp.append("/").append(atom);
@@ -341,7 +334,6 @@
                tmp.append("/").append(name);
                String uri = tmp.toString();
 
-
                // Load the content of the file
                ByteArrayOutputStream baos = new ByteArrayOutputStream();
                InputStream urlin = null;
@@ -367,7 +359,7 @@
                content.setBytes(baos.toByteArray());
                String fileExt = file.getBasePath().substring(file.getBasePath().lastIndexOf(".") + 1, file.getBasePath().length());
                CMSMimeMappings mapper = new CMSMimeMappings();
-               if(mapper.getMimeType(fileExt) != null)
+               if (mapper.getMimeType(fileExt) != null)
                {
                   content.setMimeType(mapper.getMimeType(fileExt));
                }
@@ -379,7 +371,7 @@
 
                Command newFileCMD = getCommandFactory().createNewFileCommand(file, content);
                execute(newFileCMD);
-               
+
             }
             catch (Exception e)
             {
@@ -414,7 +406,7 @@
       org.apache.jackrabbit.core.XASession session = null;
       try
       {
-         session = (org.apache.jackrabbit.core.XASession) jcr.login("anonid", "");
+         session = (org.apache.jackrabbit.core.XASession)jcr.login("anonid", "");
       }
       catch (Exception e)
       {
@@ -445,14 +437,14 @@
       Object obj = null;
       try
       {
-         xares.start(xid,XAResource.TMNOFLAGS);
+         xares.start(xid, XAResource.TMNOFLAGS);
 
          // .... add new nodes & properties and save them
-         JCRCommand jcrCmd = (JCRCommand) cmd;
+         JCRCommand jcrCmd = (JCRCommand)cmd;
          JCRCommandContext ctx = new JCRCommandContext(session, commandFactory, defaultLocale);
          jcrCmd.setContext(ctx);
-         
-         
+
+
          if ((stackFactory != null) && (stackFactory.getInterceptorStack().getLength() != 0))
          {
             jcrCmd.setHandler(handler);
@@ -464,45 +456,44 @@
             obj = jcrCmd.execute();
          }
 
-                           
          //committ the transaction
          xares.end(xid, XAResource.TMSUCCESS);
          xares.prepare(xid);
          session.save();
-         xares.commit(xid,false);
+         xares.commit(xid, false);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
-          e.printStackTrace();
-          try
-          {
-              xares.rollback(xid);
-          }
-          catch(Exception ex)
-          {
-              //we tried to roll it back...not sure what more we can do here
-              throw new CMSException(ex);
-          }
-          
+         e.printStackTrace();
+         try
+         {
+            xares.rollback(xid);
+         }
+         catch (Exception ex)
+         {
+            //we tried to roll it back...not sure what more we can do here
+            throw new CMSException(ex);
+         }
+
          if (e instanceof CMSException)
          {
-            throw (CMSException)e;
+            throw(CMSException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {
             throw new CMSException(e);
-         }         
+         }
       }
       finally
       {
          if (session != null)
-         {                          
-             //must do this otherwise, the whole cms will hang
-             session.logout();                          
+         {
+            //must do this otherwise, the whole cms will hang
+            session.logout();
          }
       }
       return obj;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr;
 
-import java.io.Serializable;
-
+import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
-import org.jboss.portal.cms.CMSException;
-import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.invocation.InvocationContext;
 
+import java.io.Serializable;
 
+
 /**
  * Interface for executing operations.
  *

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr;
 
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.common.invocation.AbstractInvocationContext;
 
+import javax.jcr.Session;
 import java.util.Locale;
 
-import javax.jcr.Session;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr;
 
 import org.jboss.portal.cms.Command;
@@ -71,7 +72,7 @@
    {
       return new UpdateFileCommand(sFile, content, makeLive);
    }
-   
+
    public Command createCopyCommand(String sFromPath, String sToPath)
    {
       return new CopyCommand(sFromPath, sToPath);

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr;
 
 import org.jboss.portal.cms.CMSException;
@@ -27,9 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public abstract class JCRCompositeCommand extends JCRCommand
 {
    protected List commands;
@@ -43,7 +42,7 @@
    {
       Iterator iterator = commands.iterator();
       Object returnObject = null;
-      while(iterator.hasNext())
+      while (iterator.hasNext())
       {
          JCRCommand command = (JCRCommand)iterator.next();
          command.setContext(context);

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr;
 
 import javax.jcr.Repository;

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Calendar;
-
-import javax.jcr.Node;
-
 import org.apache.jackrabbit.value.BinaryValue;
 import org.apache.jackrabbit.value.DateValue;
 import org.apache.jackrabbit.value.StringValue;
@@ -33,6 +30,9 @@
 import org.jboss.portal.cms.impl.jcr.JCRCommandContext;
 import org.jboss.portal.cms.model.File;
 
+import javax.jcr.Node;
+import java.util.Calendar;
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -53,7 +53,7 @@
       try
       {
          JCRCommandContext context = (JCRCommandContext)getContext();
-         Node fileNode = (Node) context.getSession().getItem(mFile.getBasePath());
+         Node fileNode = (Node)context.getSession().getItem(mFile.getBasePath());
 
          Node contentNode = fileNode.addNode(mFile.getContent().getLocale().getLanguage(), "portalcms:content");
          contentNode.setProperty("jcr:encoding", "UTF-8");
@@ -71,7 +71,7 @@
          {
             String fileExt = mFile.getBasePath().substring(mFile.getBasePath().lastIndexOf(".") + 1, mFile.getBasePath().length());
             CMSMimeMappings mapper = new CMSMimeMappings();
-            if(mapper.getMimeType(fileExt) != null)
+            if (mapper.getMimeType(fileExt) != null)
             {
                contentNode.setProperty("jcr:mimeType", mapper.getMimeType(fileExt));
             }
@@ -84,8 +84,8 @@
 
          // Save this for other sessions.
          context.getSession().save();
-         }
-      catch(Exception e)
+      }
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentCreateNewVersionCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jcr.Node;
-
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.impl.jcr.util.VersionUtil;
 import org.jboss.portal.cms.model.Content;
 
+import javax.jcr.Node;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Creates a new version of the content and labels it "LIVE".
  *
@@ -44,7 +44,6 @@
    boolean bMakeLive;
 
    /**
-    *
     * @param content
     * @param bMakeLive Whether this updated version should be made "LIVE"
     */
@@ -65,15 +64,15 @@
       try
       {
          // create versions
-         for(int i = 0; i < mContents.size(); i++)
+         for (int i = 0; i < mContents.size(); i++)
          {
-            Content content = (Content) mContents.get(i);
-            Node contentNode = (Node) context.getSession().getItem(content.getBasePath());
+            Content content = (Content)mContents.get(i);
+            Node contentNode = (Node)context.getSession().getItem(content.getBasePath());
             VersionUtil.createVersion(contentNode, this.bMakeLive);
          }
          context.getSession().save();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
 import org.apache.log4j.Logger;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
-import org.jboss.portal.cms.impl.jcr.util.VersionUtil;
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.util.FileUtil;
 
@@ -37,14 +37,10 @@
 import javax.jcr.version.VersionIterator;
 import java.util.Locale;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class ContentGetCommand extends JCRCommand
 {
-   /**
-    * The serialVersionUID
-    */
+   /** The serialVersionUID */
    private static final long serialVersionUID = 9075368287889393431L;
    String msPath;
    String msVersionNumber;
@@ -81,7 +77,7 @@
    {
       try
       {
-         if(mlocale == null)
+         if (mlocale == null)
          {
             mlocale = context.getDefaultLocale();
          }
@@ -93,10 +89,10 @@
          Node contentNode = null;
          try
          {
-            contentNode = (Node) session.getItem(this.msPath + "/" + this.mlocale.getLanguage());
+            contentNode = (Node)session.getItem(this.msPath + "/" + this.mlocale.getLanguage());
 //            VersionUtil.print(contentNode);
          }
-         catch(PathNotFoundException e)
+         catch (PathNotFoundException e)
          {
             // Silently returns null
             return null;
@@ -106,9 +102,9 @@
          content.setBasePath(this.msPath + "/" + this.mlocale.getLanguage());
          content.setDescription(contentNode.getProperty("portalcms:description").getString());
 
-         if(this.msVersionNumber == null) // get LIVE
+         if (this.msVersionNumber == null) // get LIVE
          {
-            contentNode = (Node) session.getItem(content.getBasePath());
+            contentNode = (Node)session.getItem(content.getBasePath());
             VersionHistory vh = contentNode.getVersionHistory();
             Version version = vh.getVersionByLabel("LIVE");
             NodeIterator ni = version.getNodes();
@@ -125,10 +121,10 @@
             Version liveVersion = vh.getVersionByLabel("LIVE");
 
             VersionIterator vi = vh.getAllVersions();
-            while(vi.hasNext())
+            while (vi.hasNext())
             {
                Version version = vi.nextVersion();
-               if(this.msVersionNumber.equals(version.getName())) // get the specific version
+               if (this.msVersionNumber.equals(version.getName())) // get the specific version
                {
                   NodeIterator ni = version.getNodes();
                   contentNode = ni.nextNode();
@@ -136,7 +132,7 @@
                   content.setVersionNumber(version.getName());
                   content.setVersionPath(version.getPath());
                   content.setVersionUUID(version.getUUID());
-                  if(liveVersion.getName().equals(version.getName()))  // check if this version is the live one.
+                  if (liveVersion.getName().equals(version.getName()))  // check if this version is the live one.
                   {
                      content.setLive(true);
                   }
@@ -154,7 +150,7 @@
 
          return content;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          log.error("Cannot get content", e);
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ContentGetVersionsCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Locale;
-import java.util.Vector;
+import org.jboss.portal.cms.impl.ContentImpl;
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+import org.jboss.portal.cms.model.Content;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
@@ -30,13 +32,10 @@
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import java.util.Locale;
+import java.util.Vector;
 
-import org.jboss.portal.cms.impl.ContentImpl;
-import org.jboss.portal.cms.impl.jcr.JCRCommand;
-import org.jboss.portal.cms.model.Content;
-import org.jboss.portal.cms.util.FileUtil;
 
-
 /**
  * Returns all versions for a given path, except the rootVersion.
  *
@@ -61,35 +60,35 @@
       try
       {
          Session session = context.getSession();
-         Node fileNode = (Node) session.getItem(this.msFilePath);
-         
+         Node fileNode = (Node)session.getItem(this.msFilePath);
+
          VersionHistory vh = fileNode.getVersionHistory();
          Version liveVersion = vh.getVersionByLabel("LIVE");
          Version rootVersion = vh.getRootVersion();
-         
-         
-         VersionIterator vi = vh.getAllVersions();         
-         while(vi.hasNext()) // loop versions
+
+
+         VersionIterator vi = vh.getAllVersions();
+         while (vi.hasNext()) // loop versions
          {
             Content content = new ContentImpl();
-                        
+
             Version version = vi.nextVersion();
-            if(!(version.equals(rootVersion)))  // ignore the root version
-            {                
+            if (!(version.equals(rootVersion)))  // ignore the root version
+            {
                NodeIterator ni = version.getNodes();
-               while(ni.hasNext())
+               while (ni.hasNext())
                {
                   Node node = ni.nextNode();
-                  
+
                   content.setTitle(node.getProperty("portalcms:title").getString());
                   content.setDescription(node.getProperty("portalcms:description").getString());
                   content.setLocale(new Locale(node.getProperty("portalcms:language").getString()));
 
                   content.setVersionPath(node.getPath());
                   content.setBaseUUID(node.getProperty("jcr:frozenUuid").getString());
-                  content.setBasePath(session.getNodeByUUID(content.getBaseUUID()).getPath());                  
+                  content.setBasePath(session.getNodeByUUID(content.getBaseUUID()).getPath());
                   content.setVersionUUID(node.getUUID());
-                  
+
                   /**
                    * TODO: integate content size as a node property instead of a derived value
                    *       see explanation in comments
@@ -98,34 +97,34 @@
                   //getting the size this way leads to unnecessary extraction of actual content
                   //which slows the system down dramatically
                   content.setBytes("".getBytes());
-                  
+
                   //this should be the new code
                   /*int size = 0;
                   if(node.hasProperty("portalcms:size"))
                   {
                       size = Integer.parseInt(node.getProperty("portalcms:size").getString());
                   }*/
-                  
+
                   content.setMimeType(node.getProperty("jcr:mimeType").getString());
                   content.setLastModified(node.getProperty("jcr:lastModified").getDate().getTime());
                   content.setName(node.getName());
 
                   content.setCreationDate(version.getCreated().getTime());
                   content.setVersionNumber(version.getName());
-                  if(liveVersion.getName().equals(version.getName()))  // check if this version is the live one.
+                  if (liveVersion.getName().equals(version.getName()))  // check if this version is the live one.
                   {
                      content.setLive(true);
                   }
-                  
-                  
+
+
                   content.setEncoding(node.getProperty("jcr:encoding").getString());
-                                    
+
                   contents.addElement(content);
                }
             }
-         }          
+         }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/CopyCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+import org.jboss.portal.cms.impl.jcr.util.VersionUtil;
+
 import javax.jcr.Item;
 import javax.jcr.Node;
 import javax.jcr.Workspace;
 
-import org.jboss.portal.cms.impl.jcr.JCRCommand;
-import org.jboss.portal.cms.impl.jcr.util.VersionUtil;
-
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thoams Heute</a>
@@ -53,15 +54,15 @@
          wsp.copy(msFromPath, msToPath);
 
          Item item = wsp.getSession().getItem(msToPath);
-         Node node = (Node) item;
-         
+         Node node = (Node)item;
+
          // Versions the result and make it "live"
          VersionUtil.createVersion(node, true);
 
          // Useless per the spec.
          // context.getSession().save();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+
 import javax.jcr.Item;
 import javax.jcr.Node;
 import javax.jcr.Session;
 
-import org.jboss.portal.cms.impl.jcr.JCRCommand;
-
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class DeleteCommand extends JCRCommand
 {
    /** The serialVersionUID */
@@ -51,7 +50,7 @@
       try
       {
          Session session = context.getSession();
-         if(session.itemExists(msPath))
+         if (session.itemExists(msPath))
          {
             Item item = session.getItem(msPath);
             Node parentNode = item.getParent();
@@ -59,7 +58,7 @@
             parentNode.save();
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileCreateCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
 import org.apache.jackrabbit.value.DateValue;
@@ -48,14 +49,14 @@
    {
       try
       {
-         JCRCommand existsCMD = (JCRCommand) context.getCommandFactory().createItemExistsCommand(mFile.getBasePath());
+         JCRCommand existsCMD = (JCRCommand)context.getCommandFactory().createItemExistsCommand(mFile.getBasePath());
          Boolean bExists = (Boolean)context.execute(existsCMD);
          if (!bExists.booleanValue()) // if fileNode exists already, ignore the creation.
          {
             String parentPath = NodeUtil.getParentPath(mFile.getBasePath());
             String nodeName = NodeUtil.getNodeName(mFile.getBasePath());
 
-            Node parentNode = (Node) context.getSession().getItem(parentPath);
+            Node parentNode = (Node)context.getSession().getItem(parentPath);
             Node fileNode = parentNode.addNode(nodeName, "portalcms:file");
             parentNode.setProperty("jcr:lastModified", new DateValue(Calendar.getInstance()));
             fileNode.setProperty("jcr:lastModified", new DateValue(Calendar.getInstance()));
@@ -66,7 +67,7 @@
             // TODO: Do something !
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Locale;
-
-import javax.jcr.Node;
-import javax.jcr.Session;
-
 import org.jboss.portal.cms.impl.FileImpl;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
 import org.jboss.portal.cms.util.FileUtil;
 
+import javax.jcr.Node;
+import javax.jcr.Session;
+import java.util.Locale;
+
 /**
  * Retrieves a file and its versioned, localized content.
  *
@@ -98,8 +98,8 @@
             return null;
          }
 
-         Node fileNode = (Node) session.getItem(this.path);
-         fileNode = (Node) session.getItem(this.path);
+         Node fileNode = (Node)session.getItem(this.path);
+         fileNode = (Node)session.getItem(this.path);
          file.setCreationDate(fileNode.getProperty("jcr:created").getDate().getTime());
          file.setLastModified(fileNode.getProperty("jcr:lastModified").getDate().getTime());
          file.setBasePath(this.path);
@@ -109,8 +109,8 @@
          Content content = null;
          try
          {
-            JCRCommand contentGetCMD = (JCRCommand) context.getCommandFactory().createContentGetCommand(this.path, this.versionNumber, this.locale);
-            content = (Content) context.execute(contentGetCMD);
+            JCRCommand contentGetCMD = (JCRCommand)context.getCommandFactory().createContentGetCommand(this.path, this.versionNumber, this.locale);
+            content = (Content)context.execute(contentGetCMD);
             file.setContent(this.locale, content);
          }
          catch (Exception ignore)
@@ -120,7 +120,7 @@
 
          return file;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetListCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.nodetype.NodeType;
-
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
 
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.nodetype.NodeType;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
 /**
  * Returns a list of content nodes under a filenode, but ignores versioning labels.
  *
@@ -58,17 +58,17 @@
       {
          File file = new FileImpl();
 
-         Node fileNode = (Node) context.getSession().getItem(sFilePath);
+         Node fileNode = (Node)context.getSession().getItem(sFilePath);
          file.setName(fileNode.getName());
          file.setBasePath(sFilePath);
 
          // get child content objects
          NodeIterator ni = fileNode.getNodes();
-         while(ni.hasNext())
+         while (ni.hasNext())
          {
             Node contentNode = ni.nextNode();
             NodeType nt = contentNode.getPrimaryNodeType();
-            if(nt.getName().equals("portalcms:content"))
+            if (nt.getName().equals("portalcms:content"))
             {
                Content content = new ContentImpl();
                content.setCreationDate(contentNode.getProperty("jcr:created").getDate().getTime());
@@ -86,7 +86,7 @@
          }
          return contents;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateAndVersionCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Calendar;
-
-import javax.jcr.Node;
-
 import org.apache.jackrabbit.value.BinaryValue;
 import org.apache.jackrabbit.value.DateValue;
 import org.jboss.portal.cms.CMSMimeMappings;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.impl.jcr.util.VersionUtil;
-import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+import javax.jcr.Node;
+import java.util.Calendar;
+
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class FileUpdateAndVersionCommand extends JCRCommand
 {
    /** The serialVersionUID */
@@ -46,9 +43,9 @@
    /**
     * Updates a given file content in the repo, creating a new version.
     *
-    * @param file      File obj to update
+    * @param file File obj to update
     */
-   public FileUpdateAndVersionCommand(File file,boolean makeLive)
+   public FileUpdateAndVersionCommand(File file, boolean makeLive)
    {
       this.mFile = file;
       this.bMakeLive = makeLive;
@@ -58,7 +55,7 @@
    {
       try
       {
-         Node contentNode = (Node) context.getSession().getItem(mFile.getContent().getBasePath());
+         Node contentNode = (Node)context.getSession().getItem(mFile.getContent().getBasePath());
          contentNode.checkout();
 
          contentNode.setProperty("portalcms:description", mFile.getContent().getDescription());
@@ -76,7 +73,7 @@
          {
             String fileExt = mFile.getBasePath().substring(mFile.getBasePath().lastIndexOf(".") + 1, mFile.getBasePath().length());
             CMSMimeMappings mapper = new CMSMimeMappings();
-            if(mapper.getMimeType(fileExt) != null)
+            if (mapper.getMimeType(fileExt) != null)
             {
                contentNode.setProperty("jcr:mimeType", mapper.getMimeType(fileExt));
             }
@@ -84,16 +81,16 @@
             {
                contentNode.setProperty("jcr:mimeType", "application/octet-stream");
             }
-         }                  
+         }
          contentNode.save();
-         
+
          //make a new version live version
          Node versionNode = (Node)context.getSession().getItem(mFile.getContent().getBasePath());
-         VersionUtil.createVersion(versionNode,this.bMakeLive); 
+         VersionUtil.createVersion(versionNode, this.bMakeLive);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
-          throw new RuntimeException(e);
+         throw new RuntimeException(e);
       }
       return null;
    }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileUpdateCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Calendar;
-
-import javax.jcr.Node;
-
 import org.apache.jackrabbit.value.BinaryValue;
 import org.apache.jackrabbit.value.DateValue;
 import org.jboss.portal.cms.CMSMimeMappings;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.File;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+import javax.jcr.Node;
+import java.util.Calendar;
+
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class FileUpdateCommand extends JCRCommand
 {
    /** The serialVersionUID */
@@ -44,7 +42,7 @@
    /**
     * Updates a given file content in the repo, creating a new version.
     *
-    * @param file      File obj to update
+    * @param file File obj to update
     */
    public FileUpdateCommand(File file)
    {
@@ -55,7 +53,7 @@
    {
       try
       {
-         Node contentNode = (Node) context.getSession().getItem(mFile.getContent().getBasePath());
+         Node contentNode = (Node)context.getSession().getItem(mFile.getContent().getBasePath());
          contentNode.checkout();
 
          contentNode.setProperty("portalcms:description", mFile.getContent().getDescription());
@@ -73,7 +71,7 @@
          {
             String fileExt = mFile.getBasePath().substring(mFile.getBasePath().lastIndexOf(".") + 1, mFile.getBasePath().length());
             CMSMimeMappings mapper = new CMSMimeMappings();
-            if(mapper.getMimeType(fileExt) != null)
+            if (mapper.getMimeType(fileExt) != null)
             {
                contentNode.setProperty("jcr:mimeType", mapper.getMimeType(fileExt));
             }
@@ -84,7 +82,7 @@
          }
          contentNode.save();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderCreateCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Calendar;
-
-import javax.jcr.ItemExistsException;
-import javax.jcr.Node;
-
 import org.apache.jackrabbit.value.DateValue;
 import org.apache.jackrabbit.value.StringValue;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.Folder;
 import org.jboss.portal.cms.util.NodeUtil;
 
+import javax.jcr.ItemExistsException;
+import javax.jcr.Node;
+import java.util.Calendar;
+
 /**
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -54,7 +54,7 @@
          String parentPath = NodeUtil.getParentPath(mFolder.getBasePath());
          String nodeName = NodeUtil.getNodeName(mFolder.getBasePath());
 
-         Node parentNode = (Node) context.getSession().getItem(parentPath);
+         Node parentNode = (Node)context.getSession().getItem(parentPath);
          Node folderNode = parentNode.addNode(nodeName, "portalcms:folder");
          folderNode.setProperty("portalcms:description", new StringValue(mFolder.getDescription()));
 
@@ -65,11 +65,11 @@
          folderNode.setProperty("portalcms:lastmodified", dv);
          parentNode.save();
       }
-      catch(ItemExistsException iee)
+      catch (ItemExistsException iee)
       {
          // fail silently. TODO: throw, so user knows folder exists.
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import javax.jcr.Node;
-
 import org.jboss.portal.cms.impl.FolderImpl;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.Folder;
 
+import javax.jcr.Node;
+
 /**
  * Returns a folder obj for a given path.
  *
@@ -57,7 +58,7 @@
          folder.setCreationDate(folderNode.getProperty("jcr:created").getDate().getTime());
          return folder;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderGetListCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.Session;
-import javax.jcr.nodetype.NodeType;
-
 import org.jboss.portal.cms.impl.FileImpl;
 import org.jboss.portal.cms.impl.FolderImpl;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
@@ -36,10 +29,16 @@
 import org.jboss.portal.cms.model.File;
 import org.jboss.portal.cms.model.Folder;
 
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.Session;
+import javax.jcr.nodetype.NodeType;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * Retrieves the folder for the given path and sets the child folders and child
- * files in the Folder obj.
- * 
+ * Retrieves the folder for the given path and sets the child folders and child files in the Folder obj.
+ *
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
  */
@@ -60,9 +59,9 @@
       {
          Folder folder = new FolderImpl();
 
-         Node folderNode = (Node) context.getSession().getItem(sFolderPath);
+         Node folderNode = (Node)context.getSession().getItem(sFolderPath);
          folder.setName(folderNode.getName());
-         if(!"/".equals(sFolderPath))
+         if (!"/".equals(sFolderPath))
          {
             folder.setDescription(folderNode.getProperty("portalcms:description").getString());
             folder.setLastModified(folderNode.getProperty("portalcms:lastmodified").getDate().getTime());
@@ -73,30 +72,30 @@
          List folders = new ArrayList();
          List files = new ArrayList();
          NodeIterator ni = folderNode.getNodes();
-         while(ni.hasNext())
+         while (ni.hasNext())
          {
             try
             {
-	            Node node = ni.nextNode();
-	            NodeType nt = node.getPrimaryNodeType();
-	            if(nt.getName().equals("portalcms:folder"))
-	            {
-	               JCRCommand folderList = (JCRCommand) context.getCommandFactory().createFolderGetCommand(node.getPath());
-	               Folder childFolder = (Folder) context.execute(folderList);
-	               folders.add(childFolder);
-	            }
-	            else if(nt.getName().equals("portalcms:file"))
-	            {
-	               //JCRCommand fileList = (JCRCommand) context.getCommandFactory().createFileGetMetaDataCommand(node.getPath(), null);
-	               //File childFile = (File) context.execute(fileList);
-                   File childFile = this.getFileMetaData(node.getPath(),context);
-	               files.add(childFile);
-	            }
+               Node node = ni.nextNode();
+               NodeType nt = node.getPrimaryNodeType();
+               if (nt.getName().equals("portalcms:folder"))
+               {
+                  JCRCommand folderList = (JCRCommand)context.getCommandFactory().createFolderGetCommand(node.getPath());
+                  Folder childFolder = (Folder)context.execute(folderList);
+                  folders.add(childFolder);
+               }
+               else if (nt.getName().equals("portalcms:file"))
+               {
+                  //JCRCommand fileList = (JCRCommand) context.getCommandFactory().createFileGetMetaDataCommand(node.getPath(), null);
+                  //File childFile = (File) context.execute(fileList);
+                  File childFile = this.getFileMetaData(node.getPath(), context);
+                  files.add(childFile);
+               }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-                // if this occurs, typically it is due to accessDenied. don't
-                // worry about this resource
+               // if this occurs, typically it is due to accessDenied. don't
+               // worry about this resource
             }
          }
          folder.setFolders(folders);
@@ -104,36 +103,35 @@
          return folder;
 
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }
       return null;
-   }   
-   
+   }
+
    /**
-    * This method just gets the properties associated with the file and not its content.
-    * This enhances the performance.
-    * 
+    * This method just gets the properties associated with the file and not its content. This enhances the performance.
+    *
     * @param msPath
     * @param JCRCommandContext
     * @return
     */
-   public File getFileMetaData(String msPath,JCRCommandContext context) throws Exception
+   public File getFileMetaData(String msPath, JCRCommandContext context) throws Exception
    {
-       File file = null;
-       
-       //build File
-       file = new FileImpl();
-       Session session = context.getSession();
+      File file = null;
 
-       Node fileNode = (Node) session.getItem(msPath);
-       fileNode = (Node) session.getItem(msPath);
-       file.setCreationDate(fileNode.getProperty("jcr:created").getDate().getTime());
-       file.setLastModified(fileNode.getProperty("jcr:lastModified").getDate().getTime());
-       file.setBasePath(msPath);
-       file.setName(fileNode.getName());
+      //build File
+      file = new FileImpl();
+      Session session = context.getSession();
 
-       return file;
+      Node fileNode = (Node)session.getItem(msPath);
+      fileNode = (Node)session.getItem(msPath);
+      file.setCreationDate(fileNode.getProperty("jcr:created").getDate().getTime());
+      file.setLastModified(fileNode.getProperty("jcr:lastModified").getDate().getTime());
+      file.setBasePath(msPath);
+      file.setName(fileNode.getName());
+
+      return file;
    }
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/FolderUpdateCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.util.Calendar;
-
-import javax.jcr.Node;
-
 import org.apache.jackrabbit.value.DateValue;
 import org.apache.jackrabbit.value.StringValue;
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.model.Folder;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+import javax.jcr.Node;
+import java.util.Calendar;
+
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class FolderUpdateCommand extends JCRCommand
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = 6606462970577037966L;
-   
+
    Folder mFolder;
 
    public FolderUpdateCommand(Folder folder)
@@ -56,7 +54,7 @@
          calendar.setTime(mFolder.getLastModified());
          folderNode.setProperty("portalcms:lastmodified", new DateValue(calendar));
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/GetArchiveCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
@@ -50,9 +51,7 @@
 
    private static final int BUFFER_SIZE = 1024;
 
-   /**
-    * Root folder in finished zip file that contains all nodes.
-    */
+   /** Root folder in finished zip file that contains all nodes. */
    private String rootFolderName = "contents";
 
    public GetArchiveCommand(String sRootPath, String sLanguage)
@@ -74,7 +73,7 @@
 
          return tmpFile;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }
@@ -92,20 +91,20 @@
    {
       try
       {
-         Node folderNode = (Node) this.mContext.getSession().getItem(sPath);
+         Node folderNode = (Node)this.mContext.getSession().getItem(sPath);
          NodeIterator ni = folderNode.getNodes();
-         while(ni.hasNext())
+         while (ni.hasNext())
          {
             Node node = ni.nextNode();
             NodeType nt = node.getPrimaryNodeType();
-            if(nt.getName().equals("portalcms:folder"))
+            if (nt.getName().equals("portalcms:folder"))
             {
                this.zipFiles(node.getPath(), zos);
             }
-            else if(nt.getName().equals("portalcms:file"))
+            else if (nt.getName().equals("portalcms:file"))
             {
-               JCRCommand fileList = (JCRCommand) this.mContext.getCommandFactory().createFileGetCommand(node.getPath(), new Locale(this.msLanguage));
-               File childFile = (File) this.mContext.execute(fileList);
+               JCRCommand fileList = (JCRCommand)this.mContext.getCommandFactory().createFileGetCommand(node.getPath(), new Locale(this.msLanguage));
+               File childFile = (File)this.mContext.execute(fileList);
 
                ZipEntry entry = new ZipEntry(this.rootFolderName + node.getPath());
                zos.putNextEntry(entry);
@@ -115,7 +114,7 @@
                //
                int count;
                byte[] data = new byte[BUFFER_SIZE];
-               while((count = is.read(data, 0, BUFFER_SIZE)) != -1)
+               while ((count = is.read(data, 0, BUFFER_SIZE)) != -1)
                {
                   zos.write(data, 0, count);
                }
@@ -124,7 +123,7 @@
             }
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/ItemExistsCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import javax.jcr.Session;
-
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 import org.jboss.portal.cms.util.FileUtil;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+import javax.jcr.Session;
+
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class ItemExistsCommand extends JCRCommand
 {
    /** The serialVersionUID */
@@ -56,7 +55,7 @@
             return Boolean.FALSE;
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/MoveCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import javax.jcr.Workspace;
-
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+import javax.jcr.Workspace;
+
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class MoveCommand extends JCRCommand
 {
    /** The serialVersionUID */
@@ -48,7 +47,7 @@
          Workspace wsp = context.getSession().getWorkspace();
          wsp.move(msFromPath, msToPath);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/RenameCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+
 import javax.jcr.Node;
 import javax.jcr.Session;
 
-import org.jboss.portal.cms.impl.jcr.JCRCommand;
-
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class RenameCommand extends JCRCommand
 {
    /** The serialVersionUID */
@@ -50,7 +49,7 @@
          Node node = (Node)session.getItem(this.msPath);
          session.move(node.getPath(), node.getParent().getPath() + "/" + this.msNewName);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.command;
 
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
 import org.jboss.portal.cms.impl.FolderImpl;
@@ -38,6 +31,14 @@
 import org.jboss.portal.cms.util.FileUtil;
 import org.jboss.portal.cms.util.NodeUtil;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
 /**
  * Saves an uploaded archive to the repo.
  *
@@ -64,14 +65,14 @@
       try
       {
          ZipInputStream zis = new ZipInputStream(this.mIS);
-         for(ZipEntry zipEntry = zis.getNextEntry(); zipEntry != null; zipEntry = zis.getNextEntry())
+         for (ZipEntry zipEntry = zis.getNextEntry(); zipEntry != null; zipEntry = zis.getNextEntry())
          {
             String itemName = zipEntry.getName();
-            if(!zipEntry.isDirectory())
+            if (!zipEntry.isDirectory())
             {
-               byte[] zipBytes = new byte[(int) zipEntry.getSize()];
+               byte[] zipBytes = new byte[(int)zipEntry.getSize()];
                int offset = 0;
-               while(offset < zipBytes.length)
+               while (offset < zipBytes.length)
                {
                   offset += zis.read(zipBytes, offset, zipBytes.length - offset);
                }
@@ -92,9 +93,9 @@
 
                // in case folder does not exist, yet.
                String sParentPath = NodeUtil.getParentPath(sBasePath);
-               JCRCommand nodeExists = (JCRCommand) context.getCommandFactory().createItemExistsCommand(sParentPath);
-               Boolean bExists = (Boolean) context.execute(nodeExists);
-               if(!bExists.booleanValue())
+               JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sParentPath);
+               Boolean bExists = (Boolean)context.execute(nodeExists);
+               if (!bExists.booleanValue())
                {
                   Folder folder = new FolderImpl();
                   folder.setName(sParentPath);
@@ -103,14 +104,14 @@
                   folder.setLastModified(new Date());
                   folder.setBasePath(sParentPath);
 
-                  JCRCommand parentSave = (JCRCommand) context.getCommandFactory().createFolderSaveCommand(folder);
+                  JCRCommand parentSave = (JCRCommand)context.getCommandFactory().createFolderSaveCommand(folder);
                   context.execute(parentSave);
                }
 
-               JCRCommand fileSave = (JCRCommand) context.getCommandFactory().createFileSaveCommand(file);
+               JCRCommand fileSave = (JCRCommand)context.getCommandFactory().createFileSaveCommand(file);
                context.execute(fileSave);
 
-               JCRCommand saveContentCMD = (JCRCommand) context.getCommandFactory().createContentSaveCommand(file);
+               JCRCommand saveContentCMD = (JCRCommand)context.getCommandFactory().createContentSaveCommand(file);
                context.execute(saveContentCMD);
 
                contents.add(content);
@@ -118,19 +119,19 @@
             else // isDirectory
             {
                // trim trailing slash.
-               if(itemName.endsWith("/"))
+               if (itemName.endsWith("/"))
                {
                   itemName = itemName.substring(0, itemName.length() - 1);
                }
 
-               if(!"".equals(itemName))
+               if (!"".equals(itemName))
                {
                   String sBasePath = FileUtil.cleanDoubleSlashes("/" + this.msRootPath + "/" + itemName);
                   sBasePath = FileUtil.cleanDoubleSlashes(sBasePath); // hackish, but necessary for root path uploads.
                   String sParentPath = NodeUtil.getParentPath(sBasePath);
-                  JCRCommand nodeExists = (JCRCommand) context.getCommandFactory().createItemExistsCommand(sParentPath);
-                  Boolean bExists = (Boolean) context.execute(nodeExists);
-                  if(!bExists.booleanValue())
+                  JCRCommand nodeExists = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sParentPath);
+                  Boolean bExists = (Boolean)context.execute(nodeExists);
+                  if (!bExists.booleanValue())
                   {
                      Folder folder = new FolderImpl();
                      folder.setName(sParentPath);
@@ -139,13 +140,13 @@
                      folder.setLastModified(new Date());
                      folder.setBasePath(sParentPath);
 
-                     JCRCommand parentSave = (JCRCommand) context.getCommandFactory().createFolderSaveCommand(folder);
+                     JCRCommand parentSave = (JCRCommand)context.getCommandFactory().createFolderSaveCommand(folder);
                      context.execute(parentSave);
                   }
 
-                  JCRCommand nodeExists2 = (JCRCommand) context.getCommandFactory().createItemExistsCommand(sBasePath);
-                  Boolean bExists2 = (Boolean) context.execute(nodeExists2);
-                  if(!bExists2.booleanValue())
+                  JCRCommand nodeExists2 = (JCRCommand)context.getCommandFactory().createItemExistsCommand(sBasePath);
+                  Boolean bExists2 = (Boolean)context.execute(nodeExists2);
+                  if (!bExists2.booleanValue())
                   {
                      Folder folder = new FolderImpl();
                      folder.setName(itemName);
@@ -154,7 +155,7 @@
                      folder.setLastModified(new Date());
                      folder.setBasePath(sBasePath);
 
-                     JCRCommand folderSave = (JCRCommand) context.getCommandFactory().createFolderSaveCommand(folder);
+                     JCRCommand folderSave = (JCRCommand)context.getCommandFactory().createFolderSaveCommand(folder);
                      context.execute(folderSave);
                   }
                }
@@ -163,7 +164,7 @@
          zis.close();
          return contents;
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/NewFileCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.composite;
 
 import org.jboss.portal.cms.Command;
@@ -29,9 +30,7 @@
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public class NewFileCommand extends JCRCompositeCommand
 {
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.composite;
 
-import org.jboss.portal.cms.Command; 
 import org.jboss.portal.cms.impl.jcr.JCRCompositeCommand;
 import org.jboss.portal.cms.impl.jcr.command.ContentCreateNewVersionCommand;
 import org.jboss.portal.cms.impl.jcr.command.FileUpdateCommand;
@@ -30,9 +30,7 @@
 
 import java.util.Locale;
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public class UpdateFileCommand extends JCRCompositeCommand
 {
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.ha;
 
-import org.jboss.portal.cms.impl.jcr.JCRCMS;
-import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.CMSException;
+import org.jboss.portal.cms.Command;
+import org.jboss.portal.cms.impl.jcr.JCRCMS;
 import org.jboss.portal.jems.ha.HASingletonInvoker;
 
 /**
  * Extend the JCR CMS and make it run as an ha singleton.
  *
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  * @version $Revision$
@@ -40,9 +40,7 @@
    /** The invoker. */
    private HASingletonInvoker invoker;
 
-   /**
-    * Execute the command.
-    */
+   /** Execute the command. */
    public Object execute(Command cmd) throws CMSException
    {
       if (invoker == null || invoker.isMasterNode())

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/ClusteredCacheListener.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/ClusteredCacheListener.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/ClusteredCacheListener.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.jackrabbit;
 
-import java.util.Collections;
-import java.util.Map;
-
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.core.ItemId;
+import org.apache.jackrabbit.core.state.ItemState;
+import org.apache.jackrabbit.core.state.ItemStateCache;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.TreeCache;
 import org.jboss.cache.TreeCacheListener;
@@ -31,188 +33,184 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.jackrabbit.core.state.ItemStateCache;
-import org.apache.jackrabbit.core.state.ItemState;
-import org.apache.jackrabbit.core.ItemId;
+import java.util.Collections;
+import java.util.Map;
 
-import org.apache.commons.collections.map.ReferenceMap;
 
-
 /*
  * Created on Sep 6, 2006
  *
  * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
  */
-public class ClusteredCacheListener implements TreeCacheListener 
+public class ClusteredCacheListener implements TreeCacheListener
 {
-    /**
-     * 
-     */
-    private static Logger log = LoggerFactory.getLogger(ClusteredCacheListener.class);
-        
-    /**
-     * map of node to corresponding cacheItem to be used for doing itemStateCache invalidation in a cluster
-     */ 
-    private static Map internalCaches = Collections.synchronizedMap(new ReferenceMap(ReferenceMap.HARD,ReferenceMap.WEAK));
-    private static Map nodeToItem = Collections.synchronizedMap(new ReferenceMap(ReferenceMap.HARD,ReferenceMap.WEAK));
-    private static int cacheKeyCounter = 0;
-            
-    /**
-     * 
-     */
-    private TreeCache treeCache = null;
-    
-    /**
-     * 
-     *
-     */
-    public ClusteredCacheListener()
-    {
-    }
-    
-    /**
-     * 
-     *
-     */
-    public static void storeInternalCache(String node,ItemId item,ItemStateCache cache)
-    {
-        if(!ClusteredCacheListener.internalCaches.containsValue(cache))
-        {
-            ClusteredCacheListener.internalCaches.put(getCacheKey(),cache);
-        }
-        ClusteredCacheListener.nodeToItem.put(node,item);
-    }
-    
-    /**
-     * 
-     *
-     */
-    private static synchronized String getCacheKey()
-    {
-        return String.valueOf(cacheKeyCounter++);
-    }
-    
-            
-    /**
-     * 
-     */
-    public void nodeEvicted(Fqn fqn) 
-    { 
-        try
-        {
-            String nodeName = fqn.toString();
-            ItemId item = (ItemId)ClusteredCacheListener.nodeToItem.get(nodeName);
-            if(item != null)
+   /**
+    *
+    */
+   private static Logger log = LoggerFactory.getLogger(ClusteredCacheListener.class);
+
+   /** map of node to corresponding cacheItem to be used for doing itemStateCache invalidation in a cluster */
+   private static Map internalCaches = Collections.synchronizedMap(new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK));
+   private static Map nodeToItem = Collections.synchronizedMap(new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK));
+   private static int cacheKeyCounter = 0;
+
+   /**
+    *
+    */
+   private TreeCache treeCache = null;
+
+   /**
+    *
+    *
+    */
+   public ClusteredCacheListener()
+   {
+   }
+
+   /**
+    *
+    *
+    */
+   public static void storeInternalCache(String node, ItemId item, ItemStateCache cache)
+   {
+      if (!ClusteredCacheListener.internalCaches.containsValue(cache))
+      {
+         ClusteredCacheListener.internalCaches.put(getCacheKey(), cache);
+      }
+      ClusteredCacheListener.nodeToItem.put(node, item);
+   }
+
+   /**
+    *
+    *
+    */
+   private static synchronized String getCacheKey()
+   {
+      return String.valueOf(cacheKeyCounter++);
+   }
+
+
+   /**
+    *
+    */
+   public void nodeEvicted(Fqn fqn)
+   {
+      try
+      {
+         String nodeName = fqn.toString();
+         ItemId item = (ItemId)ClusteredCacheListener.nodeToItem.get(nodeName);
+         if (item != null)
+         {
+            synchronized (item)
             {
-                synchronized(item)
-                {
-                    if(!ClusteredCacheListener.nodeToItem.containsKey(nodeName))
-                    {
-                        return;
-                    }
-                    ClusteredCacheListener.nodeToItem.remove(nodeName);                    
-		            Object[] values = ClusteredCacheListener.internalCaches.values().toArray();
-		            for(int i=0;i<values.length;i++)
-		            {		                
-		                ItemStateCache internalCache = (ItemStateCache)values[i];
-		                synchronized(internalCache)
-		                {
-			                if(internalCache.isCached(item))
-			                {
-			                    ItemState state = internalCache.retrieve(item);
-			                    
-			                    log.debug("Evicting..."+item.toString()+" (Transient:"+state.isTransient()+")");
-			                
-			                    //synchronize this operation such that no other threads can retrieve this object from the specified cache
-			                    //while this operation is in progress
-			                    if(state.getStatus() == ItemState.STATUS_EXISTING)
-			                    {
-			                        state.discard();
-			                    }
-			                }
-		                }
-		            }
-                }	            
+               if (!ClusteredCacheListener.nodeToItem.containsKey(nodeName))
+               {
+                  return;
+               }
+               ClusteredCacheListener.nodeToItem.remove(nodeName);
+               Object[] values = ClusteredCacheListener.internalCaches.values().toArray();
+               for (int i = 0; i < values.length; i++)
+               {
+                  ItemStateCache internalCache = (ItemStateCache)values[i];
+                  synchronized (internalCache)
+                  {
+                     if (internalCache.isCached(item))
+                     {
+                        ItemState state = internalCache.retrieve(item);
+
+                        log.debug("Evicting..." + item.toString() + " (Transient:" + state.isTransient() + ")");
+
+                        //synchronize this operation such that no other threads can retrieve this object from the specified cache
+                        //while this operation is in progress
+                        if (state.getStatus() == ItemState.STATUS_EXISTING)
+                        {
+                           state.discard();
+                        }
+                     }
+                  }
+               }
             }
-        }
-        catch(Exception e)
-        {
-            throw new RuntimeException(e);
-        }        
-    }
-        
-    /**
-     * 
-     */
-    public void nodeModified(Fqn fqn) 
-    {        
-    }
-    
-    /**
-     * 
-     */
-    public void nodeCreated(Fqn fqn) 
-    {        
-    }
-    
-    /**
-     * 
-     */
-    public void nodeRemoved(Fqn fqn) 
-    {
-    }
+         }
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
 
-    /**
-     * 
-     */
-    public void nodeLoaded(Fqn fqn) 
-    {
-    }
-    
-    /**
-     * 
-     */
-    public void nodeVisited(Fqn fqn) 
-    {
-    }
-    //----------------------------------------------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     */
-    public void cacheStarted(TreeCache treeCache) 
-    {
-        this.treeCache = treeCache;
-    }
+   /**
+    *
+    */
+   public void nodeModified(Fqn fqn)
+   {
+   }
 
-    /**
-     * 
-     */
-    public void cacheStopped(TreeCache treeCache) 
-    {
-    }
+   /**
+    *
+    */
+   public void nodeCreated(Fqn fqn)
+   {
+   }
 
-    /**
-     * 
-     */
-    public void viewChange(View view) 
-    {
-    }
-    
-    //---------------nodeName related methods-------------------------------------------------------------------------------------------------------------
-    /**
-     * 
-     *
-     */
-    public static String parseNodeName(String id)
-    {
-        String node = null;
-        
-        node = id.replace('/','_');
-        node = node.replace(':','_');
-        node = node.replace('{','_');
-        node = node.replace('}','_');
-        
-        return node;
-    }
-    //-------------------------------------------------------------------------------------------------------------------------------------------------- 
+   /**
+    *
+    */
+   public void nodeRemoved(Fqn fqn)
+   {
+   }
+
+   /**
+    *
+    */
+   public void nodeLoaded(Fqn fqn)
+   {
+   }
+
+   /**
+    *
+    */
+   public void nodeVisited(Fqn fqn)
+   {
+   }
+
+   //----------------------------------------------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    */
+   public void cacheStarted(TreeCache treeCache)
+   {
+      this.treeCache = treeCache;
+   }
+
+   /**
+    *
+    */
+   public void cacheStopped(TreeCache treeCache)
+   {
+   }
+
+   /**
+    *
+    */
+   public void viewChange(View view)
+   {
+   }
+
+   //---------------nodeName related methods-------------------------------------------------------------------------------------------------------------
+   /**
+    *
+    *
+    */
+   public static String parseNodeName(String id)
+   {
+      String node = null;
+
+      node = id.replace('/', '_');
+      node = node.replace(':', '_');
+      node = node.replace('{', '_');
+      node = node.replace('}', '_');
+
+      return node;
+   }
+   //--------------------------------------------------------------------------------------------------------------------------------------------------
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/jackrabbit/JackrabbitJCRService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,49 +1,50 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.jackrabbit;
 
-import org.jboss.portal.cms.util.RepositoryUtil;
-import org.jboss.portal.cms.impl.jcr.JCRService;
-import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
-import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
+import org.apache.jackrabbit.core.RepositoryImpl;
+import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException;
+import org.apache.jackrabbit.core.nodetype.NodeDef;
+import org.apache.jackrabbit.core.nodetype.NodeDefImpl;
 import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
-import org.apache.jackrabbit.core.nodetype.PropDefImpl;
+import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
+import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
 import org.apache.jackrabbit.core.nodetype.PropDef;
-import org.apache.jackrabbit.core.nodetype.NodeDefImpl;
-import org.apache.jackrabbit.core.nodetype.NodeDef;
-import org.apache.jackrabbit.core.RepositoryImpl;
-import org.apache.jackrabbit.core.config.RepositoryConfig;
+import org.apache.jackrabbit.core.nodetype.PropDefImpl;
 import org.apache.jackrabbit.name.QName;
 import org.apache.log4j.Logger;
+import org.jboss.portal.cms.impl.jcr.JCRService;
+import org.jboss.portal.cms.util.RepositoryUtil;
 import org.xml.sax.InputSource;
 
+import javax.jcr.NamespaceRegistry;
 import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.Workspace;
-import javax.jcr.NamespaceRegistry;
-import javax.jcr.RepositoryException;
-import javax.jcr.version.OnParentVersionAction;
 import javax.jcr.nodetype.NodeTypeManager;
+import javax.jcr.version.OnParentVersionAction;
 import java.io.StringReader;
 
 /**
@@ -103,7 +104,7 @@
       log.info("Repository '" + repositoryName + "' created");
 
       // Check portalcms-namespace nodetypes exist
-      if(!nodeTypesExist())
+      if (!nodeTypesExist())
       {
          log.info("The repository does not know about CMS node types");
          registerCustomNodeTypes(repository);
@@ -122,17 +123,14 @@
          repository.shutdown();
          log.info("Repository shut down successfully");
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
          log.error("Failed to unregister repository. Some locks may persist!", e);
       }
    }
 
-   /**
-    * Check for existence of namespace nodetypes.
-    *
-    */
+   /** Check for existence of namespace nodetypes. */
    public boolean nodeTypesExist() throws Exception
    {
       Session session = null;
@@ -141,7 +139,7 @@
          session = RepositoryUtil.login(repository, "anonid", "");
          Workspace wosp = session.getWorkspace();
          NodeTypeManager ntMgr = wosp.getNodeTypeManager();
-         NodeTypeRegistry ntReg = ((NodeTypeManagerImpl) ntMgr).getNodeTypeRegistry();
+         NodeTypeRegistry ntReg = ((NodeTypeManagerImpl)ntMgr).getNodeTypeRegistry();
          boolean folderType = ntReg.isRegistered(new QName("http://jboss.org/jcr/portalcms", "folder"));
          boolean fileType = ntReg.isRegistered(new QName("http://jboss.org/jcr/portalcms", "file"));
          boolean content = ntReg.isRegistered(new QName("http://jboss.org/jcr/portalcms", "content"));
@@ -202,6 +200,7 @@
     * @param superType
     * @throws javax.jcr.RepositoryException
     * @throws org.apache.jackrabbit.core.nodetype.InvalidNodeTypeDefException
+    *
     */
    private void registerNodeType(Session session, QName qname, boolean sameNameChild, String superType) throws RepositoryException, InvalidNodeTypeDefException
    {
@@ -219,7 +218,7 @@
 
       Workspace wosp = session.getWorkspace();
       NodeTypeManager ntMgr = wosp.getNodeTypeManager();
-      NodeTypeRegistry ntReg = ((NodeTypeManagerImpl) ntMgr).getNodeTypeRegistry();
+      NodeTypeRegistry ntReg = ((NodeTypeManagerImpl)ntMgr).getNodeTypeRegistry();
       ntReg.registerNodeType(ntd);
    }
 

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/NodeTypeUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.util;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 
-/**
- * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- */
+/** @author <a href="mailto:theute at jboss.org">Thomas Heute</a> */
 public class NodeTypeUtil
 {
-   
+
    public static final String FOLDER_TYPE = "portalcms:folder";
-   
+
    public static final String FILE_TYPE = "portalcms:file";
-   
+
    public static final String CONTENT_TYPE = "portalcms:content";
-   
+
    public static boolean isFolder(Node node)
    {
       try
@@ -48,7 +47,7 @@
          return false;
       }
    }
-   
+
    public static boolean isFile(Node node)
    {
       try
@@ -60,7 +59,7 @@
          return false;
       }
    }
-   
+
    public static boolean isContent(Node node)
    {
       try

Modified: trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/impl/jcr/util/VersionUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,28 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.impl.jcr.util;
 
-import java.util.Iterator;
+import org.jboss.portal.cms.CMSException;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
@@ -31,9 +32,8 @@
 import javax.jcr.version.Version;
 import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
+import java.util.Iterator;
 
-import org.jboss.portal.cms.CMSException;
-
 /**
  * Utility class for Versioning
  *
@@ -46,7 +46,7 @@
     * Creates a new node, with a new node label and checks it in.
     *
     * @param node
-    * @throws CMSException 
+    * @throws CMSException
     */
    public static void createVersion(Node node, boolean isLive) throws CMSException
    {
@@ -62,7 +62,7 @@
       {
          createContentVersion(node, isLive);
       }
-            
+
    }
 
    public static void createContentVersion(Node node, boolean isLive) throws CMSException
@@ -105,7 +105,7 @@
          Iterator it = node.getNodes();
          while (it.hasNext())
          {
-            Node tmpNode = (Node) it.next();
+            Node tmpNode = (Node)it.next();
             if (NodeTypeUtil.isContent(tmpNode))
             {
                createContentVersion(tmpNode, isLive);
@@ -132,7 +132,7 @@
          Iterator it = node.getNodes();
          while (it.hasNext())
          {
-            Node tmpNode = (Node) it.next();
+            Node tmpNode = (Node)it.next();
             if (NodeTypeUtil.isFolder(tmpNode))
             {
                createFolderVersion(tmpNode, isLive);

Modified: trunk/cms/src/main/org/jboss/portal/cms/model/CMSObject.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/model/CMSObject.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/model/CMSObject.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.model;
 
 import java.util.Date;

Modified: trunk/cms/src/main/org/jboss/portal/cms/model/Content.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/model/Content.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/model/Content.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.model;
 
 import java.io.InputStream;
@@ -36,29 +37,19 @@
 
    void setMimeType(String type);
 
-   /**
-    * @return the
-    */
+   /** @return the */
    long getSize();
 
-   /**
-    * @return Returns the content.
-    */
+   /** @return Returns the content. */
    InputStream getStream();
 
-   /**
-    * @param stream The content to set.
-    */
+   /** @param stream The content to set. */
    void setStream(InputStream stream);
 
-   /**
-    * @return Returns the content.
-    */
+   /** @return Returns the content. */
    byte[] getBytes();
 
-   /**
-    * @param bytes The content to set.
-    */
+   /** @param bytes The content to set. */
    void setBytes(byte[] bytes);
 
    String getVersionNumber();
@@ -71,14 +62,10 @@
 
    String getContentAsString();
 
-   /**
-    * @return Returns the encoding.
-    */
+   /** @return Returns the encoding. */
    String getEncoding();
 
-   /**
-    * @param encoding The encoding to set.
-    */
+   /** @param encoding The encoding to set. */
    void setEncoding(String encoding);
 
    boolean isLive();

Modified: trunk/cms/src/main/org/jboss/portal/cms/model/File.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/model/File.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/model/File.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.model;
 
 import java.util.Locale;

Modified: trunk/cms/src/main/org/jboss/portal/cms/model/Folder.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/model/Folder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/model/Folder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.model;
 
 import java.util.List;

Modified: trunk/cms/src/main/org/jboss/portal/cms/util/FileUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/util/FileUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/util/FileUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.util;
 
 import java.io.ByteArrayOutputStream;
@@ -49,14 +50,14 @@
       try
       {
          byte in[] = new byte[BUFFER_SIZE];
-         while((bytes = inputStream.read(in, 0, BUFFER_SIZE)) != -1)
+         while ((bytes = inputStream.read(in, 0, BUFFER_SIZE)) != -1)
          {
             bytesout.write(in, 0, bytes);
          }
          bytesout.flush();
          bytesout.close();
       }
-      catch(IOException e)
+      catch (IOException e)
       {
          e.printStackTrace();
          return null;

Modified: trunk/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/util/HibernateUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,10 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.cms.util;
 
+import org.hibernate.SessionFactory;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.hibernate.SessionFactory;
-
 public class HibernateUtil
 {
    public static SessionFactory getSessionFactory(String jndiName)
@@ -13,14 +36,14 @@
       {
          throw new IllegalStateException("You need to specify a JNDI Name for the HibernateSessionFactory");
       }
-      try 
+      try
       {
          InitialContext ic = new InitialContext();
-         return (SessionFactory) ic.lookup(jndiName);
+         return (SessionFactory)ic.lookup(jndiName);
       }
       catch (NamingException e)
       {
-         throw new IllegalStateException("No HibernateSessionFactory can be found in the JNDI tree at: " + jndiName);            
+         throw new IllegalStateException("No HibernateSessionFactory can be found in the JNDI tree at: " + jndiName);
       }
    }
 }

Modified: trunk/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/util/NodeUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.util;
 
 import javax.jcr.Node;
@@ -28,9 +29,7 @@
 /**
  * Helper class for dealing with Nodes. Similar to common file utility functions, for now
  *
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- *         Date: Jun 13, 2005
- *         Time: 2:37:45 PM
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a> Date: Jun 13, 2005 Time: 2:37:45 PM
  */
 public class NodeUtil
 {
@@ -46,21 +45,21 @@
    {
       String parentPath = "";
 
-      if(!isValidPath(sPath))
+      if (!isValidPath(sPath))
       {
          throw new Exception("Not a valid basePath " + sPath);
       }
 
       String[] pathChunks = sPath.split(PATH_SEPARATOR);
 
-      if(pathChunks.length == 2)
+      if (pathChunks.length == 2)
       {
          return PATH_SEPARATOR;
       }
 
-      for(int i = 0; i < pathChunks.length - 1; i++)
+      for (int i = 0; i < pathChunks.length - 1; i++)
       {
-         if(!pathChunks[i].equals(""))
+         if (!pathChunks[i].equals(""))
          {
             parentPath += PATH_SEPARATOR + pathChunks[i];
          }
@@ -77,7 +76,7 @@
    public static String getNodeName(String path) throws Exception
    {
       String[] pathChunks = path.split(PATH_SEPARATOR);
-      if(!isValidPath(path))
+      if (!isValidPath(path))
       {
          throw new Exception("Not a valid basePath!");
       }
@@ -92,7 +91,7 @@
     */
    public static boolean isValidPath(String sPath)
    {
-      if((sPath == null) ||
+      if ((sPath == null) ||
          (sPath.equals(PATH_SEPARATOR)) ||
          (sPath.endsWith(PATH_SEPARATOR)) ||
          (!sPath.startsWith(PATH_SEPARATOR)) ||
@@ -115,16 +114,16 @@
          System.out.println("################### NAME: " + node.getName() + " ###################");
          System.out.println("################### PATH: " + node.getPath() + " ###################");
          PropertyIterator pi = node.getProperties();
-         while(pi.hasNext())
+         while (pi.hasNext())
          {
             Property p = pi.nextProperty();
-            if(!p.getName().equals("jcr:mixinTypes") && !p.getName().equals("jcr:predecessors"))
+            if (!p.getName().equals("jcr:mixinTypes") && !p.getName().equals("jcr:predecessors"))
             {
                System.out.println(p.getName() + " = " + p.getString());
             }
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/cms/util/RepositoryUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.cms.util;
 
 import javax.jcr.Repository;
 import javax.jcr.Session;
-import javax.jcr.SimpleCredentials; 
+import javax.jcr.SimpleCredentials;
 
 /**
  * Helper class for JCR Repositories.
@@ -31,7 +32,7 @@
  * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
  */
 public class RepositoryUtil
-{ 
+{
 
    private RepositoryUtil()
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms;
 
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.common.junit.TestCaseFactory;
 import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
 import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 
 import java.net.URL;
 import java.util.Map;

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms;
 
 import junit.framework.TestSuite;
@@ -54,7 +55,7 @@
    public void setUp() throws Exception
    {
       super.setUp();
-      
+
       // Load config
       LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
       String config = res.asString();
@@ -85,7 +86,7 @@
          session = jcr.login("anonid", "");
          Workspace wosp = session.getWorkspace();
          NodeTypeManager mgr = wosp.getNodeTypeManager();
-         NodeTypeRegistry reg = ((NodeTypeManagerImpl) mgr).getNodeTypeRegistry();
+         NodeTypeRegistry reg = ((NodeTypeManagerImpl)mgr).getNodeTypeRegistry();
          assertTrue(reg.isRegistered(new QName("http://jboss.org/jcr/portalcms", "folder")));
          assertTrue(reg.isRegistered(new QName("http://jboss.org/jcr/portalcms", "file")));
          assertTrue(reg.isRegistered(new QName("http://jboss.org/jcr/portalcms", "content")));
@@ -131,7 +132,7 @@
          RepositoryUtil.safeLogout(session);
       }
    }
-   
+
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestRepositoryBootStrap.class);

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/TestRegEx.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms;
 
 import junit.framework.TestCase;
@@ -43,26 +44,24 @@
    private static final String URI_schemeRegex = "[a-z][-+.0-9a-z]*:";
 
    /**
-    * For our purposes, ignore URIs that start with a scheme idicator,
-    * a slash (indicating an absolute path), or a hash sign (# = ASCII hex 23).
+    * For our purposes, ignore URIs that start with a scheme idicator, a slash (indicating an absolute path), or a hash
+    * sign (# = ASCII hex 23).
     */
    private static final String URI_ignoreRegex = "" + URI_schemeRegex + "|/|\\x23";
 
    private static final String
-         regex = "((?:href|src)\\s*=\\s*)               # Capture preliminaries in $1.  \n"
-                 + "(?:                                   # First look for URL in quotes. \n"
-                 + "   ([\"\'])                           #   Capture open quote in $2.   \n"
-                 + "   (?!" + URI_ignoreRegex + ")        #   If it isn't absolute...     \n"
-                 + "   /?(.+?)                              #    ...capture URL in $3       \n"
-                 + "   \\2                                #   Match the closing quote     \n"
-                 + " |                                    # Look for non-quoted URL.      \n"
-                 + "   (?![\"\']|" + URI_ignoreRegex + ") #   If it isn't absolute...     \n"
-                 + "   /?([^\\s>]+)                         #    ...capture URL in $4       \n"
-                 + ")";
+      regex = "((?:href|src)\\s*=\\s*)               # Capture preliminaries in $1.  \n"
+      + "(?:                                   # First look for URL in quotes. \n"
+      + "   ([\"\'])                           #   Capture open quote in $2.   \n"
+      + "   (?!" + URI_ignoreRegex + ")        #   If it isn't absolute...     \n"
+      + "   /?(.+?)                              #    ...capture URL in $3       \n"
+      + "   \\2                                #   Match the closing quote     \n"
+      + " |                                    # Look for non-quoted URL.      \n"
+      + "   (?![\"\']|" + URI_ignoreRegex + ") #   If it isn't absolute...     \n"
+      + "   /?([^\\s>]+)                         #    ...capture URL in $4       \n"
+      + ")";
 
-   /**
-    * Removes header content, and leaves content between body tags
-    */
+   /** Removes header content, and leaves content between body tags */
    private static final String HTMLStripperRegex = "(.*<body[^>]*>(.+)</body>.*)";
    //private static final String HTMLStripperRegex = "(.*<body[^>]*>(.+)</body>.*')";
 
@@ -87,7 +86,7 @@
       BufferedReader reader = new BufferedReader(new FileReader(HTMLHeaderFile));
       char[] buffer = new char[1024];
       int count = 0;
-      while((count = reader.read(buffer)) != -1)
+      while ((count = reader.read(buffer)) != -1)
       {
          String read = String.valueOf(buffer, 0, count);
          fileData.append(read);
@@ -99,14 +98,14 @@
       // begin cleaner
       String CleanHTML = "";
       Matcher h = STRIP_TAGS_PATTERN.matcher(fileHTML);
-      while(h.find())
+      while (h.find())
       {
          CleanHTML = h.group(2);
       }
       // begin modifying links
       StringBuffer stringbuffer = new StringBuffer();
       Matcher m = RELATIVE_URI_PATTERN.matcher(CleanHTML);
-      while(m.find())
+      while (m.find())
       {
          String relURI = m.group(3) != null ? m.group(3) : m.group(4);
          String absoluteURI = this.buildURL("/" + relURI);
@@ -121,7 +120,7 @@
       reader = new BufferedReader(new FileReader(HTMLHeaderFile_Good));
       buffer = new char[1024];
       count = 0;
-      while((count = reader.read(buffer)) != -1)
+      while ((count = reader.read(buffer)) != -1)
       {
          String read = String.valueOf(buffer, 0, count);
          fileData.append(read);
@@ -138,9 +137,7 @@
       super.tearDown();
    }
 
-   /**
-    * Faking it.
-    */
+   /** Faking it. */
    private String buildURL(String path)
    {
       return "http://localhost:8080/portal/content" + path;

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms;
 
 import junit.framework.TestSuite;
@@ -49,7 +50,7 @@
 
    public void setUp() throws Exception
    {
-	  super.setUp();
+      super.setUp();
       LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
 
       service = new JCRCMS();

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms;
 
 import junit.framework.TestSuite;
@@ -90,7 +91,7 @@
          assertTrue("Wrong parent for /alpha/omega", parentPath.equals("/alpha"));
 
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
          fail("" + e);
@@ -110,7 +111,7 @@
          assertTrue("Wrong node name for /alpha/omega", nodeName.equals("omega"));
 
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
          fail("" + e);

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/clustering/CMSTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,49 +1,46 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.clustering;
 
 import junit.framework.Test;
-
-import org.jboss.portal.test.framework.container.client.TestSuite;
 import org.jboss.portal.test.framework.container.client.TestCase;
+import org.jboss.portal.test.framework.container.client.TestSuite;
 import org.jboss.portal.test.framework.server.NodeId;
 
-/**
- * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
- */
+/** @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a> */
 public class CMSTestSuite
 {
    public static Test suite()
    {
-      TestSuite suite = new TestSuite("test-cms-cluster.war", new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
-      
+      TestSuite suite = new TestSuite("test-cms-cluster.war", new NodeId[]{NodeId.PORTS_01, NodeId.PORTS_02});
+
       //adding file create,update,delete operations in a cluster
       suite.addTest(new TestCase(NodeId.PORTS_01, "testFileUpdate"));
       suite.addTest(new TestCase(NodeId.PORTS_01, "testFileDelete"));
-      
-      
+
       //adding folder create,update,delete operations in a cluster
-      
-      
+
+
       return suite;
    }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/clustering/FileModSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,506 +1,497 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.clustering;
 
-import java.io.IOException;
-import java.util.Locale;
-
 import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.mx.util.MBeanServerLocator;
-import javax.management.MBeanServer;
-
 import org.jboss.portal.cms.CMS;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.impl.ContentImpl;
 import org.jboss.portal.cms.impl.FileImpl;
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
-
-
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.FailureResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
-
-
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.jboss.portal.test.framework.container.result.FailureResult;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.server.NodeId;
 
-
+import javax.management.MBeanServer;
 import javax.portlet.Portlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;
 import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.util.Locale;
 
 
-
-/**
- * @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a>
- */
+/** @author <a href="mailto:sohil.shah at jboss.com">Sohil Shah</a> */
 public class FileModSequenceBuilder extends SequenceRegistryBuilder
 {
-    /**
-     * 
-     */
-    private String sFilePath = "/index.html";
-    
-    /**
-     * 
-     *
-     */
-    public void createTestFileUpdate(SequenceRegistry registry)
-    {
+   /**
+    *
+    */
+   private String sFilePath = "/index.html";
+
+   /**
+    *
+    *
+    */
+   public void createTestFileUpdate(SequenceRegistry registry)
+   {
       Sequence seq = new Sequence();
       registry.addSequence("testFileUpdate", seq);
-                  
+
       seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
-         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response) 
-         throws PortletException, PortletSecurityException, IOException
+         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Performing SetUp on..."+NodeId.PORTS_01+"(createTestFileUpdate)");
-             System.out.println("-------------------------------------------------------");
-                                                               
-             CMS service = null;
-             try
-             {
-                 MBeanServer server=MBeanServerLocator.locateJBoss();
-                 service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                 assertNotNull(service);
-                 
-                 Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath,Locale.ENGLISH);
-                 Object o = service.execute(getCommand);
-                 if(o != null)
-                 {
-                     //this file exists delete it from the system before executing this testcase
-                     Command delete = service.getCommandFactory().createDeleteCommand(sFilePath);
-                     service.execute(delete);
-                 }
-                 
-                 createFile(service);
-                 
-                                  
-                 o = service.execute(getCommand);
-                 //assert this test
-                 assertNotNull(o);
-                 System.out.println("-------------------------------------------------------");
-                 System.out.println("Content Description Before Update="+((File)o).getContent().getDescription());
-                 System.out.println("Live version Before Update="+((File)o).getContent().getVersionNumber());
-                 System.out.println("-------------------------------------------------------");                 
-             }
-             catch(Exception e)
-             {
-                 e.printStackTrace();
-                 return new FailureResult(e.toString());
-             }
-            
-             
-             PortletURL portletURL = response.createRenderURL();
-             String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(),NodeId.PORTS_02);            
-             return new InvokeGetResult(url);
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Performing SetUp on..." + NodeId.PORTS_01 + "(createTestFileUpdate)");
+            System.out.println("-------------------------------------------------------");
+
+            CMS service = null;
+            try
+            {
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
+               Object o = service.execute(getCommand);
+               if (o != null)
+               {
+                  //this file exists delete it from the system before executing this testcase
+                  Command delete = service.getCommandFactory().createDeleteCommand(sFilePath);
+                  service.execute(delete);
+               }
+
+               createFile(service);
+
+
+               o = service.execute(getCommand);
+               //assert this test
+               assertNotNull(o);
+               System.out.println("-------------------------------------------------------");
+               System.out.println("Content Description Before Update=" + ((File)o).getContent().getDescription());
+               System.out.println("Live version Before Update=" + ((File)o).getContent().getVersionNumber());
+               System.out.println("-------------------------------------------------------");
+            }
+            catch (Exception e)
+            {
+               e.printStackTrace();
+               return new FailureResult(e.toString());
+            }
+
+
+            PortletURL portletURL = response.createRenderURL();
+            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+            return new InvokeGetResult(url);
          }
       });
       seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
-         throws PortletException, PortletSecurityException, IOException
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Performing SetUp on node..."+NodeId.PORTS_02+"(createTestFileUpdate)");
-             System.out.println("-------------------------------------------------------");             
-                                     
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Performing SetUp on node..." + NodeId.PORTS_02 + "(createTestFileUpdate)");
+            System.out.println("-------------------------------------------------------");
+
             CMS service = null;
             try
             {
-                MBeanServer server=MBeanServerLocator.locateJBoss();
-                service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                assertNotNull(service);
-            
-                Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath,Locale.ENGLISH);
-                Object o = service.execute(getCommand);                
-                
-                //assert this test
-                assertNotNull(o);
-                if(o != null)
-                {
-                    System.out.println("-------------------------------------------------------");
-                    System.out.println("Content Description Before Update="+((File)o).getContent().getDescription());
-                    System.out.println("Content Description Before Update="+((File)o).getContent().getVersionNumber());
-                    System.out.println("-------------------------------------------------------");
-                }
-                else
-                {
-                    System.out.println("-------------------------------------------------------");
-                    System.out.println("File Not Found on this node "+sFilePath);
-                    System.out.println("-------------------------------------------------------");
-                }
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
+               Object o = service.execute(getCommand);
+
+               //assert this test
+               assertNotNull(o);
+               if (o != null)
+               {
+                  System.out.println("-------------------------------------------------------");
+                  System.out.println("Content Description Before Update=" + ((File)o).getContent().getDescription());
+                  System.out.println("Content Description Before Update=" + ((File)o).getContent().getVersionNumber());
+                  System.out.println("-------------------------------------------------------");
+               }
+               else
+               {
+                  System.out.println("-------------------------------------------------------");
+                  System.out.println("File Not Found on this node " + sFilePath);
+                  System.out.println("-------------------------------------------------------");
+               }
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-                e.printStackTrace();
-                return new FailureResult(e.toString());
+               e.printStackTrace();
+               return new FailureResult(e.toString());
             }
-            
+
             PortletURL portletURL = response.createRenderURL();
-            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(),NodeId.PORTS_01);            
+            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_01);
             return new InvokeGetResult(url);
          }
       });
       seq.addAction(2, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
-         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response) 
-         throws PortletException, PortletSecurityException, IOException
+         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Performing FileUpdate on..."+NodeId.PORTS_01+"(createTestFileUpdate)");
-             System.out.println("-------------------------------------------------------");
-             
-                                                  
-             CMS service = null;
-             try
-             {
-                 MBeanServer server=MBeanServerLocator.locateJBoss();
-                 service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                 assertNotNull(service);
-                 
-                 Command existsCommand = service.getCommandFactory().createItemExistsCommand(sFilePath);
-                 Boolean exists = (Boolean)service.execute(existsCommand);
-                 if(exists.booleanValue())
-                 {
-                     //update the selected file
-                     Command getCMD = service.getCommandFactory().createFileGetCommand(sFilePath,Locale.ENGLISH);
-                     File newfile = (File) service.execute(getCMD);
-                     Content content = newfile.getContent();
-                     content.setDescription("New English Description");
-                     newfile.setContent(content.getLocale(), content);                     
-                     //Command cmdUpdate = service.getCommandFactory().createFileUpdateCommand(newfile);
-                     Command cmdUpdate = service.getCommandFactory().createUpdateFileCommand(newfile,content,true);
-                     service.execute(cmdUpdate);
-                                          
-                     
-                     newfile = (File)service.execute(getCMD);                     
-                     
-                     //assert and make sure the changes specified took effect
-                     assertEquals(newfile.getContent().getDescription(),"New English Description");
-                                          
-                     System.out.println("-------------------------------------------");
-                     System.out.println("Content Description After Update ="+newfile.getContent().getDescription());
-                     System.out.println("Live Version After Update ="+newfile.getContent().getVersionNumber());                   
-                     System.out.println("-------------------------------------------");                                                               
-                 }             
-                 else
-                 {
-                     System.out.println("The content was not successfully created");
-                     assertTrue("The content was not successfully created",exists.booleanValue());
-                 }
-             }
-             catch(Exception e)
-             {
-                 e.printStackTrace();
-                 return new FailureResult(e.toString());
-             }
-             
-                                                   
-             PortletURL portletURL = response.createRenderURL();
-             String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(),NodeId.PORTS_02);            
-             return new InvokeGetResult(url);
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Performing FileUpdate on..." + NodeId.PORTS_01 + "(createTestFileUpdate)");
+            System.out.println("-------------------------------------------------------");
+
+
+            CMS service = null;
+            try
+            {
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command existsCommand = service.getCommandFactory().createItemExistsCommand(sFilePath);
+               Boolean exists = (Boolean)service.execute(existsCommand);
+               if (exists.booleanValue())
+               {
+                  //update the selected file
+                  Command getCMD = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
+                  File newfile = (File)service.execute(getCMD);
+                  Content content = newfile.getContent();
+                  content.setDescription("New English Description");
+                  newfile.setContent(content.getLocale(), content);
+                  //Command cmdUpdate = service.getCommandFactory().createFileUpdateCommand(newfile);
+                  Command cmdUpdate = service.getCommandFactory().createUpdateFileCommand(newfile, content, true);
+                  service.execute(cmdUpdate);
+
+
+                  newfile = (File)service.execute(getCMD);
+
+                  //assert and make sure the changes specified took effect
+                  assertEquals(newfile.getContent().getDescription(), "New English Description");
+
+                  System.out.println("-------------------------------------------");
+                  System.out.println("Content Description After Update =" + newfile.getContent().getDescription());
+                  System.out.println("Live Version After Update =" + newfile.getContent().getVersionNumber());
+                  System.out.println("-------------------------------------------");
+               }
+               else
+               {
+                  System.out.println("The content was not successfully created");
+                  assertTrue("The content was not successfully created", exists.booleanValue());
+               }
+            }
+            catch (Exception e)
+            {
+               e.printStackTrace();
+               return new FailureResult(e.toString());
+            }
+
+
+            PortletURL portletURL = response.createRenderURL();
+            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+            return new InvokeGetResult(url);
          }
       });
       seq.addAction(3, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
-         throws PortletException, PortletSecurityException, IOException
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Checking FileUpdate on node..."+NodeId.PORTS_02+"(createTestFileUpdate)");
-             System.out.println("-------------------------------------------------------");             
-                                     
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Checking FileUpdate on node..." + NodeId.PORTS_02 + "(createTestFileUpdate)");
+            System.out.println("-------------------------------------------------------");
+
             CMS service = null;
             try
             {
-                MBeanServer server=MBeanServerLocator.locateJBoss();
-                service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                assertNotNull(service);
-            
-                Command getCMD = service.getCommandFactory().createFileGetCommand(sFilePath,Locale.ENGLISH);
-                File file = (File) service.execute(getCMD);
-                                                                
-                if(file != null)
-                {                                        
-                    System.out.println("-------------------------------------------");
-                    System.out.println("Content Description After Update ="+file.getContent().getDescription());
-                    System.out.println("Live Version After Update ="+file.getContent().getVersionNumber());
-                    System.out.println("-------------------------------------------");
-                }
-                else
-                {
-                    System.out.println("-------------------------------------------------------");
-                    System.out.println("File Not Found on this node "+sFilePath);
-                    System.out.println("-------------------------------------------------------"); 
-                }
-                
-                assertEquals(file.getContent().getDescription(),"New English Description");
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command getCMD = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
+               File file = (File)service.execute(getCMD);
+
+               if (file != null)
+               {
+                  System.out.println("-------------------------------------------");
+                  System.out.println("Content Description After Update =" + file.getContent().getDescription());
+                  System.out.println("Live Version After Update =" + file.getContent().getVersionNumber());
+                  System.out.println("-------------------------------------------");
+               }
+               else
+               {
+                  System.out.println("-------------------------------------------------------");
+                  System.out.println("File Not Found on this node " + sFilePath);
+                  System.out.println("-------------------------------------------------------");
+               }
+
+               assertEquals(file.getContent().getDescription(), "New English Description");
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-                e.printStackTrace();
-                return new FailureResult(e.toString());
+               e.printStackTrace();
+               return new FailureResult(e.toString());
             }
-            
+
             return new EndTestResult();
          }
       });
-    }
-    
-    /**
-     * 
-     *
-     */
-    public void createTestFileDelete(SequenceRegistry registry)
-    {
+   }
+
+   /**
+    *
+    *
+    */
+   public void createTestFileDelete(SequenceRegistry registry)
+   {
       Sequence seq = new Sequence();
       registry.addSequence("testFileDelete", seq);
-                  
+
       seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
-         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response) 
-         throws PortletException, PortletSecurityException, IOException
+         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Performing SetUp on..."+NodeId.PORTS_01+"(createTestFileDelete)");
-             System.out.println("-------------------------------------------------------");
-                                                               
-             CMS service = null;
-             try
-             {
-                 MBeanServer server=MBeanServerLocator.locateJBoss();
-                 service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                 assertNotNull(service);
-                 
-                 Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath,Locale.ENGLISH);
-                 Object o = service.execute(getCommand);
-                 if(o == null)
-                 {
-                     createFile(service);
-                 }
-                 
-                 //assert this test                 
-                 o = service.execute(getCommand);
-                 assertNotNull(o);                                  
-             }
-             catch(Exception e)
-             {
-                 e.printStackTrace();
-                 return new FailureResult(e.toString());
-             }
-            
-             
-             PortletURL portletURL = response.createRenderURL();
-             String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(),NodeId.PORTS_02);            
-             return new InvokeGetResult(url);
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Performing SetUp on..." + NodeId.PORTS_01 + "(createTestFileDelete)");
+            System.out.println("-------------------------------------------------------");
+
+            CMS service = null;
+            try
+            {
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
+               Object o = service.execute(getCommand);
+               if (o == null)
+               {
+                  createFile(service);
+               }
+
+               //assert this test
+               o = service.execute(getCommand);
+               assertNotNull(o);
+            }
+            catch (Exception e)
+            {
+               e.printStackTrace();
+               return new FailureResult(e.toString());
+            }
+
+
+            PortletURL portletURL = response.createRenderURL();
+            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+            return new InvokeGetResult(url);
          }
       });
       seq.addAction(1, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
-         throws PortletException, PortletSecurityException, IOException
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Performing SetUp on node..."+NodeId.PORTS_02+"(createTestFileDelete)");
-             System.out.println("-------------------------------------------------------");             
-                                     
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Performing SetUp on node..." + NodeId.PORTS_02 + "(createTestFileDelete)");
+            System.out.println("-------------------------------------------------------");
+
             CMS service = null;
             try
             {
-                MBeanServer server=MBeanServerLocator.locateJBoss();
-                service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                assertNotNull(service);
-            
-                Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath,Locale.ENGLISH);
-                Object o = service.execute(getCommand);                
-                
-                //assert this test
-                assertNotNull(o);                                
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command getCommand = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
+               Object o = service.execute(getCommand);
+
+               //assert this test
+               assertNotNull(o);
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-                e.printStackTrace();
-                return new FailureResult(e.toString());
+               e.printStackTrace();
+               return new FailureResult(e.toString());
             }
-            
+
             PortletURL portletURL = response.createRenderURL();
-            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(),NodeId.PORTS_01);            
+            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_01);
             return new InvokeGetResult(url);
          }
       });
       seq.addAction(2, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
-         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response) 
-         throws PortletException, PortletSecurityException, IOException
+         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Performing FileDelete on..."+NodeId.PORTS_01+"(createTestFileDelete)");
-             System.out.println("-------------------------------------------------------");
-             
-                                                  
-             CMS service = null;
-             try
-             {
-                 MBeanServer server=MBeanServerLocator.locateJBoss();
-                 service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                 assertNotNull(service);
-                 
-                 Command existsCommand = service.getCommandFactory().createItemExistsCommand(sFilePath);
-                 Boolean exists = (Boolean)service.execute(existsCommand);
-                 if(exists.booleanValue())
-                 {
-                     //delete the file
-                     Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFilePath);
-                     service.execute(deleteCMD);                     
-                     
-                     //assert and make sure the changes specified took effect
-                     Command existsCMD = service.getCommandFactory().createItemExistsCommand(sFilePath);
-                     Boolean existsCheck = (Boolean)service.execute(existsCMD);
-                     assertFalse(existsCheck.booleanValue());
-                 }             
-                 else
-                 {
-                     System.out.println("The content was not successfully created");
-                     assertTrue("The content was not successfully created",exists.booleanValue());
-                 }
-             }
-             catch(Exception e)
-             {
-                 e.printStackTrace();
-                 return new FailureResult(e.toString());
-             }
-             
-                                                   
-             PortletURL portletURL = response.createRenderURL();
-             String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(),NodeId.PORTS_02);            
-             return new InvokeGetResult(url);
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Performing FileDelete on..." + NodeId.PORTS_01 + "(createTestFileDelete)");
+            System.out.println("-------------------------------------------------------");
+
+
+            CMS service = null;
+            try
+            {
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               Command existsCommand = service.getCommandFactory().createItemExistsCommand(sFilePath);
+               Boolean exists = (Boolean)service.execute(existsCommand);
+               if (exists.booleanValue())
+               {
+                  //delete the file
+                  Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFilePath);
+                  service.execute(deleteCMD);
+
+                  //assert and make sure the changes specified took effect
+                  Command existsCMD = service.getCommandFactory().createItemExistsCommand(sFilePath);
+                  Boolean existsCheck = (Boolean)service.execute(existsCMD);
+                  assertFalse(existsCheck.booleanValue());
+               }
+               else
+               {
+                  System.out.println("The content was not successfully created");
+                  assertTrue("The content was not successfully created", exists.booleanValue());
+               }
+            }
+            catch (Exception e)
+            {
+               e.printStackTrace();
+               return new FailureResult(e.toString());
+            }
+
+
+            PortletURL portletURL = response.createRenderURL();
+            String url = TestCaseContext.getCurrentContext().rewriteURLForNode(portletURL.toString(), NodeId.PORTS_02);
+            return new InvokeGetResult(url);
          }
       });
       seq.addAction(3, NodeId.PORTS_02, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
-         throws PortletException, PortletSecurityException, IOException
+            throws PortletException, PortletSecurityException, IOException
          {
-             System.out.println("-------------------------------------------------------");
-             System.out.println("Checking FileDelete on node..."+NodeId.PORTS_02+"(createTestFileDelete)");
-             System.out.println("-------------------------------------------------------");             
-                                     
+            System.out.println("-------------------------------------------------------");
+            System.out.println("Checking FileDelete on node..." + NodeId.PORTS_02 + "(createTestFileDelete)");
+            System.out.println("-------------------------------------------------------");
+
             CMS service = null;
             try
             {
-                MBeanServer server=MBeanServerLocator.locateJBoss();
-                service = (CMS)MBeanProxyExt.create(CMS.class,"portal:service=CMS",server);             
-                assertNotNull(service);
-            
-                //delete the file
-                Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFilePath);
-                service.execute(deleteCMD);                     
-                
-                //assert and make sure the changes specified took effect
-                Command existsCMD = service.getCommandFactory().createItemExistsCommand(sFilePath);
-                Boolean existsCheck = (Boolean)service.execute(existsCMD);
-                assertFalse("File delete on Node-1 not successfully propagated to Node-2",existsCheck.booleanValue());
+               MBeanServer server = MBeanServerLocator.locateJBoss();
+               service = (CMS)MBeanProxyExt.create(CMS.class, "portal:service=CMS", server);
+               assertNotNull(service);
+
+               //delete the file
+               Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFilePath);
+               service.execute(deleteCMD);
+
+               //assert and make sure the changes specified took effect
+               Command existsCMD = service.getCommandFactory().createItemExistsCommand(sFilePath);
+               Boolean existsCheck = (Boolean)service.execute(existsCMD);
+               assertFalse("File delete on Node-1 not successfully propagated to Node-2", existsCheck.booleanValue());
             }
-            catch(Exception e)
+            catch (Exception e)
             {
-                e.printStackTrace();
-                return new FailureResult(e.toString());
+               e.printStackTrace();
+               return new FailureResult(e.toString());
             }
-            
+
             return new EndTestResult();
          }
       });
-    }
-    
-    /**
-     * 
-     *
-     */
-    private void createFile(CMS service)
-    {
-        try
-        {
-	        System.out.println("Creating content for...."+sFilePath);
-	        
-	        //create this content first 
-	        // create file english
-	        File file = new FileImpl();
-	        file.setBasePath(sFilePath);
-	
-	        Content content = new ContentImpl();
-	        content.setEncoding("UTF-8");
-	        content.setTitle("English Title");
-	        content.setDescription("English Description");
-	        content.setBasePath(sFilePath + "/" + Locale.ENGLISH.getLanguage());
-	        content.setBytes("1234567890".getBytes());
-	        content.setMimeType("text/html");
-	        file.setContent(Locale.ENGLISH, content);
-	
-	        // save english file
-	        Command saveFileCMD = service.getCommandFactory().createFileSaveCommand(file);
-	        service.execute(saveFileCMD);
-	
-	        //save english content
-	        Command saveContentCMD = service.getCommandFactory().createContentSaveCommand(file);
-	        service.execute(saveContentCMD);
-	
-	        // version the english content node
-	        Command verCMD = service.getCommandFactory().createContentCreateNewVersionCommand(content, true);
-	        service.execute(verCMD);
-	
-	        // create content spanish
-	        Content contentSP = new ContentImpl();
-	        contentSP.setEncoding("UTF-8");
-	        contentSP.setTitle("Spanish Title");
-	        contentSP.setDescription("Spanish Description");
-	        contentSP.setBasePath(sFilePath + "/es");
-	        contentSP.setBytes("0987654321".getBytes());
-	        contentSP.setMimeType("text/html");
-	        file.setContent(new Locale("es"), contentSP);
-	
-	        //save spanish content
-	        Command saveSPContentCMD = service.getCommandFactory().createContentSaveCommand(file);
-	        service.execute(saveSPContentCMD);
-	
-	        // version the spanish content node
-	        Command verSPCMD = service.getCommandFactory().createContentCreateNewVersionCommand(contentSP, true);
-	        service.execute(verSPCMD);
-        }
-        catch(Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }       
+   }
+
+   /**
+    *
+    *
+    */
+   private void createFile(CMS service)
+   {
+      try
+      {
+         System.out.println("Creating content for...." + sFilePath);
+
+         //create this content first
+         // create file english
+         File file = new FileImpl();
+         file.setBasePath(sFilePath);
+
+         Content content = new ContentImpl();
+         content.setEncoding("UTF-8");
+         content.setTitle("English Title");
+         content.setDescription("English Description");
+         content.setBasePath(sFilePath + "/" + Locale.ENGLISH.getLanguage());
+         content.setBytes("1234567890".getBytes());
+         content.setMimeType("text/html");
+         file.setContent(Locale.ENGLISH, content);
+
+         // save english file
+         Command saveFileCMD = service.getCommandFactory().createFileSaveCommand(file);
+         service.execute(saveFileCMD);
+
+         //save english content
+         Command saveContentCMD = service.getCommandFactory().createContentSaveCommand(file);
+         service.execute(saveContentCMD);
+
+         // version the english content node
+         Command verCMD = service.getCommandFactory().createContentCreateNewVersionCommand(content, true);
+         service.execute(verCMD);
+
+         // create content spanish
+         Content contentSP = new ContentImpl();
+         contentSP.setEncoding("UTF-8");
+         contentSP.setTitle("Spanish Title");
+         contentSP.setDescription("Spanish Description");
+         contentSP.setBasePath(sFilePath + "/es");
+         contentSP.setBytes("0987654321".getBytes());
+         contentSP.setMimeType("text/html");
+         file.setContent(new Locale("es"), contentSP);
+
+         //save spanish content
+         Command saveSPContentCMD = service.getCommandFactory().createContentSaveCommand(file);
+         service.execute(saveSPContentCMD);
+
+         // version the spanish content node
+         Command verSPCMD = service.getCommandFactory().createContentCreateNewVersionCommand(contentSP, true);
+         service.execute(verSPCMD);
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import org.jboss.portal.cms.impl.jcr.JCRCMS;
@@ -38,10 +39,10 @@
  */
 public class AbstractCommandTestCase extends AbstractCMSTestCase
 {
-    /**
-     * 
-     */
-    protected JCRCMS service;
+   /**
+    *
+    */
+   protected JCRCMS service;
 
    public AbstractCommandTestCase(Map parametrization)
    {
@@ -49,32 +50,32 @@
    }
 
    /**
-     * 
-     */
-    public void setUp() throws Exception
-    {       
-       super.setUp();
-       
-       LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
-       Document config = res.asDocument(XML.getDocumentBuilderFactory().newDocumentBuilder());
+    *
+    */
+   public void setUp() throws Exception
+   {
+      super.setUp();
 
-       service = new JCRCMS();
-       service.setDoChecking(true);
-       service.setDefaultLocale(Locale.ENGLISH.getDisplayName());
-       service.setDefaultContentLocation("default-content/default");
+      LoaderResource res = new CLLoader().getResource("jcr/repository.xml");
+      Document config = res.asDocument(XML.getDocumentBuilderFactory().newDocumentBuilder());
 
-       service.setConfig(config.getDocumentElement());
-       service.setRepositoryName("repo");
-       service.setHomeDir("repotest");
-       service.startService();
-    }
+      service = new JCRCMS();
+      service.setDoChecking(true);
+      service.setDefaultLocale(Locale.ENGLISH.getDisplayName());
+      service.setDefaultContentLocation("default-content/default");
 
-    /**
-     * 
-     */
-    public void tearDown() throws Exception
-    {
-       service.stopService();      
-       super.tearDown();
-    }
+      service.setConfig(config.getDocumentElement());
+      service.setRepositoryName("repo");
+      service.setHomeDir("repotest");
+      service.startService();
+   }
+
+   /**
+    *
+    */
+   public void tearDown() throws Exception
+   {
+      service.stopService();
+      super.tearDown();
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -30,7 +31,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedInputStream;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -43,23 +43,23 @@
  */
 public class TestFileArchiveUpload extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileArchiveUpload(Map parametrization)
    {
@@ -67,8 +67,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -80,15 +80,15 @@
       service.setDefaultLocale(Locale.ENGLISH.getLanguage());
       InputStream is = Tools.safeBufferedWrapper(new FileInputStream(sZipFile));
       Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en");
-      List contentsToVersion = (List) service.execute(storearchiveCMD);
+      List contentsToVersion = (List)service.execute(storearchiveCMD);
 
       Command createVersions = service.getCommandFactory()
-            .createContentCreateNewVersionCommand(contentsToVersion, true);
+         .createContentCreateNewVersionCommand(contentsToVersion, true);
       service.execute(createVersions);
 
       // retrieve list
       Command listCMD = service.getCommandFactory().createFolderGetListCommand("/ziptest/poop");
-      Folder whopper = (Folder) service.execute(listCMD);
+      Folder whopper = (Folder)service.execute(listCMD);
       List folders = whopper.getFolders();
       List files = whopper.getFiles();
       assertEquals("Folder Size incorrect", folders.size(), 1);
@@ -96,7 +96,7 @@
 
       // retrieve list
       Command listCMD2 = service.getCommandFactory().createFolderGetListCommand("/ziptest/poop/music");
-      Folder whopper2 = (Folder) service.execute(listCMD2);
+      Folder whopper2 = (Folder)service.execute(listCMD2);
       List folders2 = whopper2.getFolders();
       List files2 = whopper2.getFiles();
       assertEquals("Folder Size incorrect", folders2.size(), 0);
@@ -104,10 +104,10 @@
 
       // retrieve list
       Command listCMD3 = service.getCommandFactory().createFolderGetListCommand("/");
-      Folder whopper3 = (Folder) service.execute(listCMD3);
+      Folder whopper3 = (Folder)service.execute(listCMD3);
       List folders3 = whopper3.getFolders();
       List files3 = whopper3.getFiles();
 
       is.close();
-   }      
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCopy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -40,23 +41,23 @@
  */
 public class TestFileCopy extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileCopy(Map parametrization)
    {
@@ -64,8 +65,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -73,8 +74,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileCopy() throws CMSException
    {
@@ -84,7 +85,7 @@
       service.execute(copyCMD);
 
       Command getCMD = service.getCommandFactory().createFileGetCommand(sCopyToFilePath, Locale.ENGLISH);
-      File newfile = (File) service.execute(getCMD);
+      File newfile = (File)service.execute(getCMD);
       Content content = newfile.getContent();
       assertEquals("Encoding Incorrect", content.getEncoding(), "UTF-8");
       assertEquals("Mimetype Incorrect", content.getMimeType(), "image/gif");
@@ -93,18 +94,18 @@
       assertEquals("Desc Incorrect", content.getDescription(), "English Description");
 
       Command getCMDSP = service.getCommandFactory().createFileGetCommand(sCopyToFilePath, new Locale("es"));
-      File newfileSP = (File) service.execute(getCMDSP);
+      File newfileSP = (File)service.execute(getCMDSP);
       Content contentSP = newfileSP.getContent();
       assertEquals("Encoding Incorrect", contentSP.getEncoding(), "UTF-8");
       assertEquals("Mimetype Incorrect", contentSP.getMimeType(), "image/gif");
       assertEquals("Language Incorrect", contentSP.getLocale().getLanguage(), "es");
       assertEquals("Title Incorrect", contentSP.getTitle(), "Spanish Title");
       assertEquals("Desc Incorrect", contentSP.getDescription(), "Spanish Description");
-   }   
-   
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreate.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -43,23 +44,23 @@
  */
 public class TestFileCreate extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileCreate(Map parametrization)
    {
@@ -67,8 +68,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -76,8 +77,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileCreate() throws Exception
    {
@@ -127,26 +128,26 @@
       Session session = null;
 
       session = RepositoryUtil.login(service.getRepository(), "anonid", "");
-      Node fileNode = (Node) session.getItem(sFilePath);
+      Node fileNode = (Node)session.getItem(sFilePath);
       assertEquals("Name incorrect", NodeUtil.getNodeName(file.getBasePath()), fileNode.getName());
 
       Node contentNodeEN = fileNode.getNode(Locale.ENGLISH.getLanguage());
       assertEquals("Encoding Incorrect", content.getEncoding(), contentNodeEN.getProperty("jcr:encoding").getString());
       assertEquals("Mimetype Incorrect", content.getMimeType(), contentNodeEN.getProperty("jcr:mimeType").getString());
       assertEquals("Language Incorrect", content.getLocale().getLanguage(), contentNodeEN.getProperty(
-            "portalcms:language").getString());
+         "portalcms:language").getString());
       assertEquals("Title Incorrect", content.getTitle(), contentNodeEN.getProperty("portalcms:title").getString());
       assertEquals("Desc Incorrect", content.getDescription(), contentNodeEN.getProperty("portalcms:description")
-            .getString());
+         .getString());
 
       Node contentNodeSP = fileNode.getNode("es");
       assertEquals("Encoding Incorrect", contentSP.getEncoding(), contentNodeSP.getProperty("jcr:encoding").getString());
       assertEquals("Mimetype Incorrect", contentSP.getMimeType(), contentNodeSP.getProperty("jcr:mimeType").getString());
       assertEquals("Language Incorrect", contentSP.getLocale().getLanguage(), contentNodeSP.getProperty(
-            "portalcms:language").getString());
+         "portalcms:language").getString());
       assertEquals("Title Incorrect", contentSP.getTitle(), contentNodeSP.getProperty("portalcms:title").getString());
       assertEquals("Desc Incorrect", contentSP.getDescription(), contentNodeSP.getProperty("portalcms:description")
-            .getString());
+         .getString());
 
       session.logout();
    }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileCreateFailed.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -46,23 +47,23 @@
  */
 public class TestFileCreateFailed extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileCreateFailed(Map parametrization)
    {
@@ -70,8 +71,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -79,8 +80,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileCreateFailed() throws Exception
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileDelete.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -42,23 +43,23 @@
  */
 public class TestFileDelete extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileDelete(Map parametrization)
    {
@@ -66,8 +67,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -75,13 +76,13 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public void testFileDelete() throws Exception
    {
       createFile();
-      
+
       // delete old test nodes
       Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFilePath);
       service.execute(deleteCMD);
@@ -104,11 +105,11 @@
       assertFalse(sText + " not Deleted", session.itemExists(sText));
 
       RepositoryUtil.safeLogout(session);
-   }   
-   
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -40,23 +41,23 @@
  */
 public class TestFileGet extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileGet(Map parametrization)
    {
@@ -64,22 +65,20 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFileGet.class);
    }
 
-   /**
-    * Tests retrieval of the version labeled LIVE.
-    */
+   /** Tests retrieval of the version labeled LIVE. */
    public void testFileGet() throws CMSException
    {
       createFile();
       Command getCMD = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
-      File newfile = (File) service.execute(getCMD);
+      File newfile = (File)service.execute(getCMD);
 
       Content content = newfile.getContent();
       assertEquals("Encoding Incorrect", content.getEncoding(), "UTF-8");
@@ -87,11 +86,11 @@
       assertEquals("Language Incorrect", content.getLocale().getLanguage(), "en");
       assertEquals("Title Incorrect", content.getTitle(), "English Title");
       assertEquals("Desc Incorrect", content.getDescription(), "English Description");
-   }   
-   
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetList.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -41,23 +42,23 @@
  */
 public class TestFileGetList extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileGetList(Map parametrization)
    {
@@ -65,36 +66,34 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFileGetList.class);
    }
 
-   /**
-    * Tests retrieving a list of contents under a file and the versions for contents.
-    */
+   /** Tests retrieving a list of contents under a file and the versions for contents. */
    public void testFileList() throws CMSException
    {
       createFile();
       Command getFileListCMD = service.getCommandFactory().createFileGetListCommand(sFilePath);
-      List contentList = (List) service.execute(getFileListCMD);
+      List contentList = (List)service.execute(getFileListCMD);
       assertTrue("Incorrect list size", contentList.size() == 2);
 
       for (int i = 0; i < contentList.size(); i++)
       {
-         Content content = (Content) contentList.get(i);
+         Content content = (Content)contentList.get(i);
          Command getContentVersionsCMD = service.getCommandFactory().createContentGetVersionsCommand(
-               content.getBasePath());
-         List versionList = (List) service.execute(getContentVersionsCMD);
+            content.getBasePath());
+         List versionList = (List)service.execute(getContentVersionsCMD);
       }
-   }   
-   
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileGetVersion.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -40,23 +41,23 @@
  */
 public class TestFileGetVersion extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileGetVersion(Map parametrization)
    {
@@ -64,29 +65,27 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFileGetVersion.class);
    }
 
-   /**
-    * Tests retrieval of a specific version by version number.
-    */
+   /** Tests retrieval of a specific version by version number. */
    public void testFileGetVersion() throws CMSException
    {
       createFile();
       // get specific file version
       Command getCMDV = service.getCommandFactory().createFileGetCommand(sFilePath, "1.0", Locale.ENGLISH);
-      File Vnewfile = (File) service.execute(getCMDV);
+      File Vnewfile = (File)service.execute(getCMDV);
       assertTrue("Incorrect version number for file object", Vnewfile.getContent().getVersionNumber().equals("1.0"));
-   }   
-   
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFileUpdate.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -45,23 +46,23 @@
  */
 public class TestFileUpdate extends AbstractCommandTestCase
 {
-    String sFilePath = "/testdoc.gif";
+   String sFilePath = "/testdoc.gif";
 
-    String sCopyToFilePath = "/testdoccopy.gif";
+   String sCopyToFilePath = "/testdoccopy.gif";
 
-    // zip vars
-    String sZipPath = "/poop";
+   // zip vars
+   String sZipPath = "/poop";
 
-    String sZipFile = "resources/test/jcr/ziptest.zip";
+   String sZipFile = "resources/test/jcr/ziptest.zip";
 
-    String sJPG = "/hibernate_logo.gif";
+   String sJPG = "/hibernate_logo.gif";
 
-    String sText = "/training.txt";
-    
+   String sText = "/training.txt";
 
+
    /**
-    * 
     *
+    *
     */
    public TestFileUpdate(Map parametrization)
    {
@@ -69,8 +70,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -79,14 +80,15 @@
 
    /**
     * Tests updating a file and its content.
-    * @throws Exception 
+    *
+    * @throws Exception
     */
    public void testFileUpdate() throws Exception
    {
       createFile();
       Session session = RepositoryUtil.login(service.getRepository(), "anonid", "");
       Command getCMD = service.getCommandFactory().createFileGetCommand(sFilePath, Locale.ENGLISH);
-      File newfile = (File) service.execute(getCMD);
+      File newfile = (File)service.execute(getCMD);
       Content content = newfile.getContent();
       content.setDescription("New English Description");
       newfile.setContent(content.getLocale(), content);
@@ -97,17 +99,17 @@
       Command cmdVersion = service.getCommandFactory().createContentCreateNewVersionCommand(content, true);
       service.execute(cmdVersion);
 
-      boolean descriptionupdated = ((Property) session.getItem("/testdoc.gif/en/portalcms:description")).getString()
-            .equals("New English Description");
+      boolean descriptionupdated = ((Property)session.getItem("/testdoc.gif/en/portalcms:description")).getString()
+         .equals("New English Description");
       assertTrue("Incorrect description for file object", descriptionupdated);
 
       // version std out dump
-      VersionUtil.print((Node) session.getItem(content.getBasePath()));
-   }   
-   
+      VersionUtil.print((Node)session.getItem(content.getBasePath()));
+   }
+
    /**
-    * 
     *
+    *
     */
    private void createFile() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCopy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -42,19 +43,15 @@
  */
 public class TestFolderCopy extends AbstractCommandTestCase
 {
-   /**
-    * A test folder path *
-    */
+   /** A test folder path * */
    String sFolderPath = "/alpha";
 
-   /**
-    * A test folder path for copied folder trees *
-    */
+   /** A test folder path for copied folder trees * */
    String sCopyToFolderPath = "/alpha/beta";
 
    /**
-    * 
     *
+    *
     */
    public TestFolderCopy(Map parametrization)
    {
@@ -62,74 +59,72 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFolderCopy.class);
    }
 
-   
-   /**
-    * Copy test data from repo
-    */
+
+   /** Copy test data from repo */
    public void testFolderCopy() throws Exception
    {
-	      // create folder object
-	      Folder folder = new FolderImpl();
-	      folder.setCreationDate(new Date());
-	      folder.setDescription("Folder description");
-	      folder.setTitle("Folder Title");
-	      folder.setLastModified(new Date());
-	      folder.setName("Alpha Folder");
-	      folder.setBasePath("/alpha1");
-	
-	      // save folder
-	      Command saveCMD = service.getCommandFactory().createFolderSaveCommand(folder);
-	      service.execute(saveCMD);
-	
-	      // create file english
-	      File file = new FileImpl();
-	      file.setBasePath("/alpha1/toto.txt");
-	
-	      Content content = new ContentImpl();
-	      content.setEncoding("UTF-8");
-	      content.setTitle("English Title");
-	      content.setDescription("English Description");
-	      content.setBasePath("/alpha1/toto.txt/" + Locale.ENGLISH.getLanguage());
-	      content.setBytes("1234567890".getBytes());
-	      content.setMimeType("image/gif");
-	
-	      file.setContent(Locale.ENGLISH, content);
-	
-	      // save english file
-	      Command saveFileCMD = service.getCommandFactory().createNewFileCommand(file, content);
-	      service.execute(saveFileCMD);
-	
-	      Folder folder2 = new FolderImpl();
-	      folder2.setCreationDate(new Date());
-	      folder2.setDescription("Folder description");
-	      folder2.setTitle("Folder Title");
-	      folder2.setLastModified(new Date());
-	      folder2.setName("Beta Folder");
-	      folder2.setBasePath("/beta1");
-	
-	      // save folder
-	      Command saveCMD2 = service.getCommandFactory().createFolderSaveCommand(folder2);
-	      service.execute(saveCMD2);
-	
-	      Command copyFolderCMD = service.getCommandFactory().createCopyCommand("/alpha1", "/beta1/test");
-	      service.execute(copyFolderCMD);
-	
-	      Command getLiveCMD = service.getCommandFactory().createFileGetCommand("/alpha1/toto.txt", Locale.ENGLISH);
-	      File fileOrig = (File) service.execute(getLiveCMD);
-	
-	      assertNotNull("Content of the original file is null", fileOrig.getContent());
-	
-	      getLiveCMD = service.getCommandFactory().createFileGetCommand("/beta1/test/toto.txt", Locale.ENGLISH);
-	      File fileCopy = (File) service.execute(getLiveCMD);
-	
-	      assertNotNull("Content of the copied file is null", fileCopy.getContent());
-   }   
+      // create folder object
+      Folder folder = new FolderImpl();
+      folder.setCreationDate(new Date());
+      folder.setDescription("Folder description");
+      folder.setTitle("Folder Title");
+      folder.setLastModified(new Date());
+      folder.setName("Alpha Folder");
+      folder.setBasePath("/alpha1");
+
+      // save folder
+      Command saveCMD = service.getCommandFactory().createFolderSaveCommand(folder);
+      service.execute(saveCMD);
+
+      // create file english
+      File file = new FileImpl();
+      file.setBasePath("/alpha1/toto.txt");
+
+      Content content = new ContentImpl();
+      content.setEncoding("UTF-8");
+      content.setTitle("English Title");
+      content.setDescription("English Description");
+      content.setBasePath("/alpha1/toto.txt/" + Locale.ENGLISH.getLanguage());
+      content.setBytes("1234567890".getBytes());
+      content.setMimeType("image/gif");
+
+      file.setContent(Locale.ENGLISH, content);
+
+      // save english file
+      Command saveFileCMD = service.getCommandFactory().createNewFileCommand(file, content);
+      service.execute(saveFileCMD);
+
+      Folder folder2 = new FolderImpl();
+      folder2.setCreationDate(new Date());
+      folder2.setDescription("Folder description");
+      folder2.setTitle("Folder Title");
+      folder2.setLastModified(new Date());
+      folder2.setName("Beta Folder");
+      folder2.setBasePath("/beta1");
+
+      // save folder
+      Command saveCMD2 = service.getCommandFactory().createFolderSaveCommand(folder2);
+      service.execute(saveCMD2);
+
+      Command copyFolderCMD = service.getCommandFactory().createCopyCommand("/alpha1", "/beta1/test");
+      service.execute(copyFolderCMD);
+
+      Command getLiveCMD = service.getCommandFactory().createFileGetCommand("/alpha1/toto.txt", Locale.ENGLISH);
+      File fileOrig = (File)service.execute(getLiveCMD);
+
+      assertNotNull("Content of the original file is null", fileOrig.getContent());
+
+      getLiveCMD = service.getCommandFactory().createFileGetCommand("/beta1/test/toto.txt", Locale.ENGLISH);
+      File fileCopy = (File)service.execute(getLiveCMD);
+
+      assertNotNull("Content of the copied file is null", fileCopy.getContent());
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderCreate.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -41,19 +42,15 @@
  */
 public class TestFolderCreate extends AbstractCommandTestCase
 {
-   /**
-    * A test folder path *
-    */
+   /** A test folder path * */
    String sFolderPath = "/alpha";
 
-   /**
-    * A test folder path for copied folder trees *
-    */
+   /** A test folder path for copied folder trees * */
    String sCopyToFolderPath = "/alpha/beta";
 
    /**
-    * 
     *
+    *
     */
    public TestFolderCreate(Map parametrization)
    {
@@ -61,18 +58,18 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFolderCreate.class);
    }
 
-   
+
    /**
-    * 
     *
+    *
     */
    public void testFolderCreate() throws Exception
    {
@@ -91,7 +88,7 @@
 
       // get folder - RAW
       Session session = RepositoryUtil.login(service.getRepository(), "anonid", "");
-      Node folderNode = (Node) session.getItem(sFolderPath);
+      Node folderNode = (Node)session.getItem(sFolderPath);
       assertNotNull("FolderNodeis null", folderNode);
       assertTrue("Incorrect primarynodetype", folderNode.getPrimaryNodeType().getName().equals("portalcms:folder"));
       assertTrue("Incorrect Name for " + sFolderPath, folderNode.getName().equals("alpha"));
@@ -100,5 +97,5 @@
       Property description = folderNode.getProperty("portalcms:description");
       assertNotNull("Folder description  is null", description);
       assertTrue("Incorrect description for " + sFolderPath, description.getString().equals("Folder description"));
-   }   
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderDelete.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -36,19 +37,15 @@
  */
 public class TestFolderDelete extends AbstractCommandTestCase
 {
-   /**
-    * A test folder path *
-    */
+   /** A test folder path * */
    String sFolderPath = "/alpha";
 
-   /**
-    * A test folder path for copied folder trees *
-    */
+   /** A test folder path for copied folder trees * */
    String sCopyToFolderPath = "/alpha/beta";
 
    /**
-    * 
     *
+    *
     */
    public TestFolderDelete(Map parametrization)
    {
@@ -56,8 +53,8 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
@@ -66,17 +63,18 @@
 
    /**
     * Deleted test data from repo, and also tests delete cmd.
+    *
     * @throws Exception
     */
    public void testFolderDelete() throws Exception
    {
-       Session session = RepositoryUtil.login(service.getRepository(), "anonid", "");
-	   Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFolderPath);
-       service.execute(deleteCMD);
-       assertFalse(sFolderPath + " failed to delete.", session.itemExists(sFolderPath));
+      Session session = RepositoryUtil.login(service.getRepository(), "anonid", "");
+      Command deleteCMD = service.getCommandFactory().createDeleteCommand(sFolderPath);
+      service.execute(deleteCMD);
+      assertFalse(sFolderPath + " failed to delete.", session.itemExists(sFolderPath));
 
-       Command deleteToCMD = service.getCommandFactory().createDeleteCommand(sCopyToFolderPath);
-       service.execute(deleteToCMD);
-       assertFalse(sCopyToFolderPath + " failed to delete.", session.itemExists(sCopyToFolderPath));
-   }   
+      Command deleteToCMD = service.getCommandFactory().createDeleteCommand(sCopyToFolderPath);
+      service.execute(deleteToCMD);
+      assertFalse(sCopyToFolderPath + " failed to delete.", session.itemExists(sCopyToFolderPath));
+   }
 }

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderGet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -37,19 +38,15 @@
  */
 public class TestFolderGet extends AbstractCommandTestCase
 {
-   /**
-    * A test folder path *
-    */
+   /** A test folder path * */
    String sFolderPath = "/alpha";
 
-   /**
-    * A test folder path for copied folder trees *
-    */
+   /** A test folder path for copied folder trees * */
    String sCopyToFolderPath = "/alpha/beta";
 
    /**
-    * 
     *
+    *
     */
    public TestFolderGet(Map parametrization)
    {
@@ -57,31 +54,31 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFolderGet.class);
    }
 
-   
+
    /**
-    * 
     *
+    *
     */
    public void testFolderGet() throws CMSException
    {
       createFolder();
       // get folder
       Command getCMD = service.getCommandFactory().createFolderGetCommand(sFolderPath);
-      Folder newFolder = (Folder) service.execute(getCMD);
+      Folder newFolder = (Folder)service.execute(getCMD);
       assertTrue("Folder retrieval failed.", newFolder.getDescription().equals("Folder description"));
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public void createFolder() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/TestFolderUpdate.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.commands;
 
 import junit.framework.TestSuite;
@@ -40,19 +41,15 @@
  */
 public class TestFolderUpdate extends AbstractCommandTestCase
 {
-   /**
-    * A test folder path *
-    */
+   /** A test folder path * */
    String sFolderPath = "/alpha";
 
-   /**
-    * A test folder path for copied folder trees *
-    */
+   /** A test folder path for copied folder trees * */
    String sCopyToFolderPath = "/alpha/beta";
 
    /**
-    * 
     *
+    *
     */
    public TestFolderUpdate(Map parametrization)
    {
@@ -60,25 +57,25 @@
    }
 
    /**
-    * 
     *
+    *
     */
    public static TestSuite suite() throws Exception
    {
       return createTestSuite(TestFolderUpdate.class);
    }
 
-   
+
    /**
-    * 
     *
+    *
     */
    public void testFolderUpdate() throws Exception
    {
       createFolder();
       // get folder
       Command getCMD = service.getCommandFactory().createFolderGetCommand(sFolderPath);
-      Folder newFolder = (Folder) service.execute(getCMD);
+      Folder newFolder = (Folder)service.execute(getCMD);
 
       // update folder
       newFolder.setDescription("new folder description");
@@ -86,17 +83,17 @@
       service.execute(cmdUpdate);
 
       Session session = RepositoryUtil.login(service.getRepository(), "anonid", "");
-      Property prop = (Property) session.getItem("/alpha/portalcms:description");
+      Property prop = (Property)session.getItem("/alpha/portalcms:description");
       System.out.println(prop.getString());
-      boolean descriptionupdated = ((Property) session.getItem("/alpha/portalcms:description")).getString().equals(
-            "new folder description");
+      boolean descriptionupdated = ((Property)session.getItem("/alpha/portalcms:description")).getString().equals(
+         "new folder description");
       assertTrue("Incorrect description for folder: ", descriptionupdated);
       session.save();
    }
-   
+
    /**
-    * 
     *
+    *
     */
    public void createFolder() throws CMSException
    {

Modified: trunk/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/main/org/jboss/portal/test/cms/mock/RuntimeExceptionCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,32 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.cms.mock;
 
 import org.jboss.portal.cms.impl.jcr.JCRCommand;
 
 /**
  * Command that throws an exception
+ *
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  */
 public class RuntimeExceptionCommand extends JCRCommand

Modified: trunk/cms/src/resources/hibernate/domain.hbm.xml
===================================================================
--- trunk/cms/src/resources/hibernate/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/hibernate/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,173 +1,196 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class name="org.jboss.portal.cms.hibernate.state.VersionBinVal" table="jbp_cms_version_binval" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="id"
-            column="BINVAL_ID"
-            type="string"
-            length="255"/>
+         name="id"
+         column="BINVAL_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="BINVAL_DATA"
-            type="blob"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="BINVAL_DATA"
+         type="blob"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionNode" table="jbp_cms_version_node" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="nodeId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="nodeId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="NODE_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="NODE_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionProp" table="jbp_cms_version_prop" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="propId"
-            column="PROP_ID"
-            type="string"
-            length="255"/>
+         name="propId"
+         column="PROP_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="PROP_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="PROP_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionRefs" table="jbp_cms_version_refs" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="refId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="refId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="REFS_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="REFS_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPBinVal" table="jbp_cms_wsp_binval" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="id"
-            column="BINVAL_ID"
-            type="string"
-            length="255"/>
+         name="id"
+         column="BINVAL_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="BINVAL_DATA"
-            type="blob"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="BINVAL_DATA"
+         type="blob"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPNode" table="jbp_cms_wsp_node" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="nodeId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="nodeId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="NODE_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="NODE_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPProp" table="jbp_cms_wsp_prop" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="propId"
-            column="PROP_ID"
-            type="string"
-            length="255"/>
+         name="propId"
+         column="PROP_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="PROP_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="PROP_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPRefs" table="jbp_cms_wsp_refs" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="refId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="refId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="REFS_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="REFS_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.CMSEntry" table="jbp_cms_cmsentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"
@@ -189,17 +212,17 @@
    </class>
    <class name="org.jboss.portal.cms.hibernate.RepositoryEntry" table="jbp_cms_repositoryentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"
@@ -221,17 +244,17 @@
    </class>
    <class name="org.jboss.portal.cms.hibernate.VersionEntry" table="jbp_cms_versionentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"

Modified: trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml
===================================================================
--- trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
@@ -23,7 +46,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="driverClass"><inject bean="DataSourceConfig" property="driverClass"/></property>
       <property name="connectionURL"><inject bean="DataSourceConfig" property="connectionURL"/></property>
       <property name="userName"><inject bean="DataSourceConfig" property="userName"/></property>
@@ -39,13 +63,13 @@
       </property>
    </bean>
 
-<!--
-   <bean name="TestBean" class="org.jboss.portal.test.identity.DBUserTestCase">
-      <constructor factoryMethod="getBean">
-         <factory bean="BeanFactory"/>
-         <parameter>TestBean</parameter>
-      </constructor>
-      <property name="hibernate"><inject bean="HibernateSupport"/></property>
-   </bean>
--->
+   <!--
+      <bean name="TestBean" class="org.jboss.portal.test.identity.DBUserTestCase">
+         <constructor factoryMethod="getBean">
+            <factory bean="BeanFactory"/>
+            <parameter>TestBean</parameter>
+         </constructor>
+         <property name="hibernate"><inject bean="HibernateSupport"/></property>
+      </bean>
+   -->
 </deployment>

Modified: trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml
===================================================================
--- trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/mime-mappings.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <mime-mappings>
    <!-- Establish the default MIME type mappings -->
    <mime-mapping>

Modified: trunk/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml
===================================================================
--- trunk/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/cms/clustering/sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
-<server> 	   
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<server>
    <mbean
       code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
       name="portal:service=Hibernate,type=CMS"
@@ -19,11 +42,11 @@
       <xmbean/>
       
       <depends>jboss.jca:service=DataSourceBinding,name=TestPortalDS</depends>      
-      <depends>portal:service=Hibernate,type=CMS</depends>      
+      <depends>portal:service=Hibernate,type=CMS</depends>
       <!--depends>portal:service=JAASLoginModule</depends-->
-      
+
       <!--depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Cms</depends-->
-      
+
       <attribute name="DoChecking">true</attribute>
       <attribute name="DefaultContentLocation">default-content/default/</attribute>
       <attribute name="DefaultLocale">en</attribute>
@@ -80,7 +103,7 @@
                   <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                   <param name="externalBLOBs" value="false"/>
                </PersistenceManager>
-               
+
                <!-- XMLPersistenceManager: uses FileSystem for storage -->
                <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
 
@@ -108,7 +131,7 @@
                   <param name="schemaObjectPrefix" value="VersionEntry"/>
                   <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                </FileSystem>
-               
+
                <!-- LocalFileSystem: uses FileSystem for storage. -->
                <!--
                <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
@@ -127,7 +150,7 @@
                   <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                   <param name="externalBLOBs" value="false"/>
                </PersistenceManager>
-               
+
                <!-- XMLPersistenceManager: uses FileSystem for storage -->
                <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
             </Versioning>
@@ -174,153 +197,152 @@
       <depends optional-attribute-name="Callback" proxy-type="attribute">portal:service=CMS</depends>
       <depends optional-attribute-name="ProxyFactory">portal:service=ProxyFactory,type=CMS</depends>
    </mbean>
-   
+
    <!-- TreeCache configuration used to cache CMS data -->
    <mbean code="org.jboss.cache.TreeCache"
-           name="cms.pm.cache:service=TreeCache">
+          name="cms.pm.cache:service=TreeCache">
    
            <depends>jboss:service=Naming</depends>
            <depends>jboss:service=TransactionManager</depends>
            <depends>portal:service=Hibernate,type=CMS</depends>
            <depends>portal:service=CMS</depends>
-   
-           <!--
-           Configure the TransactionManager
-           -->
-           <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-           
-           <!--
-		Node locking scheme:
-		OPTIMISTIC
-		PESSIMISTIC (default)
-		using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
-	   -->
-	   <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
-   
-           <!--
-               Isolation level : SERIALIZABLE
-                                 REPEATABLE_READ (default)
-                                 READ_COMMITTED
-                                 READ_UNCOMMITTED
-                                 NONE
-           -->
-           <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-           
-           	   
-   
-           <!--
-                Valid modes are LOCAL
-                                REPL_ASYNC
-                                REPL_SYNC
-                                INVALIDATION_ASYNC
-                                INVALIDATION_SYNC
-           -->
-           <!-- in a non-HA environment with the Jackrabbit cluster is activated -->
-           <!--attribute name="CacheMode">INVALIDATION_ASYNC</attribute-->           
-           <!-- in a HA environment since there is only a singleton node for CMS, this can be local -->
-           <attribute name="CacheMode">LOCAL</attribute>           
-   
-           <!--
-           Just used for async repl: use a replication queue
-           -->
-           <attribute name="UseReplQueue">false</attribute>
-   
-           <!--
-               Replication interval for replication queue (in ms)
-           -->
-           <attribute name="ReplQueueInterval">0</attribute>
-   
-           <!--
-               Max number of elements which trigger replication
-           -->
-           <attribute name="ReplQueueMaxElements">0</attribute>
-   
-           <!-- Name of cluster. Needs to be the same for all clusters, in order
-                to find each other
-           -->
-           <attribute name="ClusterName">JCRPMCache</attribute>
-   
-           <!-- JGroups protocol stack properties. Can also be a URL,
-                e.g. file:/home/bela/default.xml
-              <attribute name="ClusterProperties"></attribute>
-           -->
-   
-           <attribute name="ClusterConfig">
+
+      <!--
+      Configure the TransactionManager
+      -->
+      <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+      <!--
+        Node locking scheme:
+        OPTIMISTIC
+        PESSIMISTIC (default)
+        using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
+        -->
+      <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <!-- in a non-HA environment with the Jackrabbit cluster is activated -->
+      <!--attribute name="CacheMode">INVALIDATION_ASYNC</attribute-->
+      <!-- in a HA environment since there is only a singleton node for CMS, this can be local -->
+      <attribute name="CacheMode">LOCAL</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name="UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name="ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name="ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all clusters, in order
+           to find each other
+      -->
+      <attribute name="ClusterName">JCRPMCache</attribute>
+
+      <!-- JGroups protocol stack properties. Can also be a URL,
+           e.g. file:/home/bela/default.xml
+         <attribute name="ClusterProperties"></attribute>
+      -->
+
+      <attribute name="ClusterConfig">
                <config>
                    <!-- UDP: if you have a multihomed machine,
                    set the bind_addr attribute to the appropriate NIC IP address -->
-                   <!-- UDP: On Windows machines, because of the media sense feature
-                    being broken with multicast (even after disabling media sense)
-                    set the loopback attribute to true -->
-                   <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-                       ip_ttl="64" ip_mcast="true" 
+                  <!-- UDP: On Windows machines, because of the media sense feature
+            being broken with multicast (even after disabling media sense)
+            set the loopback attribute to true -->
+                  <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+                       ip_ttl="64" ip_mcast="true"
                        receive_on_all_interfaces="true"
                        mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
                        ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
                        loopback="false"/>
                    <PING timeout="2000" num_initial_members="3"
-                       up_thread="false" down_thread="false"/>
+                         up_thread="false" down_thread="false"/>
                    <MERGE2 min_interval="10000" max_interval="20000"/>
-                   <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
-                   <FD_SOCK/>
+                  <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
+                  <FD_SOCK/>
                    <VERIFY_SUSPECT timeout="1500"
-                       up_thread="false" down_thread="false"/>
+                                   up_thread="false" down_thread="false"/>
                    <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-                       max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                                  max_xmit_size="8192" up_thread="false" down_thread="false"/>
                    <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-                       down_thread="false"/>
+                            down_thread="false"/>
                    <pbcast.STABLE desired_avg_gossip="20000"
-                       up_thread="false" down_thread="false"/>
+                                  up_thread="false" down_thread="false"/>
                    <FRAG frag_size="8192"
-                       down_thread="false" up_thread="false"/>
+                         down_thread="false" up_thread="false"/>
                    <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-                       shun="true" print_local_addr="true"/>
+                               shun="true" print_local_addr="true"/>
                    <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
                </config>
            </attribute>
-   
-           <!--
-            Whether or not to fetch state on joining a cluster
-            NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
-            
-            Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA 
-           -->
-           <!--attribute name="FetchInMemoryState">false</attribute-->
-   
-           <!--
-               The max amount of time (in milliseconds) we wait until the
-               initial state (ie. the contents of the cache) are retrieved from
-               existing members in a clustered environment
-           -->
-           <attribute name="InitialStateRetrievalTimeout">20000</attribute>
-   
-           <!--
-               Number of milliseconds to wait until all responses for a
-               synchronous call have been received.
-           -->
-           <attribute name="SyncReplTimeout">20000</attribute>
-   
-           <!-- Max number of milliseconds to wait for a lock acquisition -->
-           <attribute name="LockAcquisitionTimeout">15000</attribute>
-   
-   
-           <!-- Name of the eviction policy class. -->
-           <attribute name="EvictionPolicyClass"></attribute>
-          
-          <!--
-             Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
-             class loader, e.g., inside an application server. Default is "false".
-             
-             Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA 
-          -->
-           <!--attribute name="UseRegionBasedMarshalling">false</attribute-->
-           
-           <!--
-           		Configuring the PortalCMSCacheLoader
-           		
-           		CacheLoader configuratoon for 1.4.0
-           -->           
-           <attribute name="CacheLoaderConfiguration">
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
+
+       Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+      -->
+      <!--attribute name="FetchInMemoryState">false</attribute-->
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          initial state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name="SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Name of the eviction policy class. -->
+      <attribute name="EvictionPolicyClass"></attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "false".
+
+         Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+      -->
+      <!--attribute name="UseRegionBasedMarshalling">false</attribute-->
+
+      <!--
+            Configuring the PortalCMSCacheLoader
+
+            CacheLoader configuratoon for 1.4.0
+      -->
+      <attribute name="CacheLoaderConfiguration">
                <config>                
                    <passivation>false</passivation>
                    <preload></preload>
@@ -334,21 +356,21 @@
                    </cacheloader>
                </config>
            </attribute>
-           <!--
-           		Configuring the PortalCMSCacheLoader
-           		
-           		CacheLoader configuratoon for 1.2.4SP2
-           --> 
-           <!--attribute name="CacheLoaderClass">org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</attribute>       
-           <attribute name="CacheLoaderConfig" replace="false"></attribute>
-           <attribute name="CacheLoaderPassivation">false</attribute>
-           <attribute name="CacheLoaderPreload"></attribute>
-           <attribute name="CacheLoaderShared">false</attribute>           
-           <attribute name="CacheLoaderFetchTransientState">false</attribute>
-           <attribute name="CacheLoaderFetchPersistentState">false</attribute>
-           <attribute name="CacheLoaderAsynchronous">false</attribute-->          
+      <!--
+            Configuring the PortalCMSCacheLoader
+
+            CacheLoader configuratoon for 1.2.4SP2
+      -->
+      <!--attribute name="CacheLoaderClass">org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</attribute>
+     <attribute name="CacheLoaderConfig" replace="false"></attribute>
+     <attribute name="CacheLoaderPassivation">false</attribute>
+     <attribute name="CacheLoaderPreload"></attribute>
+     <attribute name="CacheLoaderShared">false</attribute>
+     <attribute name="CacheLoaderFetchTransientState">false</attribute>
+     <attribute name="CacheLoaderFetchPersistentState">false</attribute>
+     <attribute name="CacheLoaderAsynchronous">false</attribute-->
     </mbean>
-          
+
    <!-- not sure if these should be removed since Command Framework is used now -->
    <!--mbean
       code="org.jboss.portal.core.cms.CMSObjectCommandFactory"
@@ -382,7 +404,7 @@
       <attribute name="Prefix">content</attribute>
       <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
    </mbean-->
-   
+
    <!-- intereceptors -->
    <!--mbean
       code="org.jboss.portal.cms.impl.interceptors.LogInterceptor"
@@ -429,81 +451,81 @@
          <depends-list-element>portal:service=Interceptor,type=Cms,name=Log</depends-list-element>
       </depends-list>
    </mbean-->
-   
+
    <!--
-   	| Uncomment in clustered mode : TreeCache configuration for the clustered JackRabbit in-memory cache...
-   	| This helps with node synching, but there are other aspects of JackRabbit like versioning subsystem
-   	| and locking system that get out-of-sync in the cluster. This leads to unpredicatable results and hence
-   	| the idea to cluster JackRabbit needs to be dropped at this time
-   -->   	
+      | Uncomment in clustered mode : TreeCache configuration for the clustered JackRabbit in-memory cache...
+      | This helps with node synching, but there are other aspects of JackRabbit like versioning subsystem
+      | and locking system that get out-of-sync in the cluster. This leads to unpredicatable results and hence
+      | the idea to cluster JackRabbit needs to be dropped at this time
+   -->
    <!--mbean code="org.jboss.cache.TreeCache"
-               name="jackrabbit.inmemory.cache:service=TreeCache">
-       
-           <depends>jboss:service=Naming</depends>
-	       <depends>jboss:service=TransactionManager</depends>
-	       
-	       <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-	               	         
-	       
-	               
-	               <attribute name="IsolationLevel">NONE</attribute>
-	       
-	               
-	               <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
-	       
-	               
-	               <attribute name="UseReplQueue">false</attribute>
-	       
-	               
-	               <attribute name="ReplQueueInterval">0</attribute>
-	       
-	               
-	               <attribute name="ReplQueueMaxElements">0</attribute>
-	       
-	               
-	               <attribute name="ClusterName">JackRabbitInternalCache</attribute>
-	       
-	               
-	       
-	               <attribute name="ClusterConfig">
-	                   <config>	                       
-	                       <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-	                           ip_ttl="64" ip_mcast="true" 
-	                           receive_on_all_interfaces="true"
-	                           mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
-	                           ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
-	                           loopback="false"/>                
-	                       <PING timeout="2000" num_initial_members="3"
-	                           up_thread="false" down_thread="false"/>
-	                       <MERGE2 min_interval="10000" max_interval="20000"/>	                       
-	                       <FD_SOCK/>
-	                       <VERIFY_SUSPECT timeout="1500"
-	                           up_thread="false" down_thread="false"/>
-	                       <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-	                           max_xmit_size="8192" up_thread="false" down_thread="false"/>
-	                       <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-	                           down_thread="false"/>
-	                       <pbcast.STABLE desired_avg_gossip="20000"
-	                           up_thread="false" down_thread="false"/>
-	                       <FRAG frag_size="8192"
-	                           down_thread="false" up_thread="false"/>
-	                       <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-	                           shun="true" print_local_addr="true"/>
-	                       <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
-	                   </config>
-	               </attribute>
-	       
-	               <attribute name="FetchInMemoryState">false</attribute>
-	       
-	               <attribute name="InitialStateRetrievalTimeout">20000</attribute>
-	       
-	               <attribute name="SyncReplTimeout">20000</attribute>
-	       	       
-	               <attribute name="LockAcquisitionTimeout">15000</attribute>
-	       
-	       	               
-	               <attribute name="EvictionPolicyClass"></attribute>
-	              	              
-        		  <attribute name="UseRegionBasedMarshalling">false</attribute>                        
-    </mbean-->      
+              name="jackrabbit.inmemory.cache:service=TreeCache">
+
+          <depends>jboss:service=Naming</depends>
+         <depends>jboss:service=TransactionManager</depends>
+
+         <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+
+
+                 <attribute name="IsolationLevel">NONE</attribute>
+
+
+                 <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
+
+
+                 <attribute name="UseReplQueue">false</attribute>
+
+
+                 <attribute name="ReplQueueInterval">0</attribute>
+
+
+                 <attribute name="ReplQueueMaxElements">0</attribute>
+
+
+                 <attribute name="ClusterName">JackRabbitInternalCache</attribute>
+
+
+
+                 <attribute name="ClusterConfig">
+                     <config>
+                         <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+                             ip_ttl="64" ip_mcast="true"
+                             receive_on_all_interfaces="true"
+                             mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
+                             ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
+                             loopback="false"/>
+                         <PING timeout="2000" num_initial_members="3"
+                             up_thread="false" down_thread="false"/>
+                         <MERGE2 min_interval="10000" max_interval="20000"/>
+                         <FD_SOCK/>
+                         <VERIFY_SUSPECT timeout="1500"
+                             up_thread="false" down_thread="false"/>
+                         <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
+                             max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                         <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
+                             down_thread="false"/>
+                         <pbcast.STABLE desired_avg_gossip="20000"
+                             up_thread="false" down_thread="false"/>
+                         <FRAG frag_size="8192"
+                             down_thread="false" up_thread="false"/>
+                         <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
+                             shun="true" print_local_addr="true"/>
+                         <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
+                     </config>
+                 </attribute>
+
+                 <attribute name="FetchInMemoryState">false</attribute>
+
+                 <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+                 <attribute name="SyncReplTimeout">20000</attribute>
+
+                 <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+                 <attribute name="EvictionPolicyClass"></attribute>
+
+               <attribute name="UseRegionBasedMarshalling">false</attribute>
+   </mbean-->
 </server>

Modified: trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,173 +1,196 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class name="org.jboss.portal.cms.hibernate.state.VersionBinVal" table="jbp_cms_version_binval" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="id"
-            column="BINVAL_ID"
-            type="string"
-            length="255"/>
+         name="id"
+         column="BINVAL_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="BINVAL_DATA"
-            type="blob"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="BINVAL_DATA"
+         type="blob"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionNode" table="jbp_cms_version_node" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="nodeId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="nodeId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="NODE_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="NODE_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionProp" table="jbp_cms_version_prop" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="propId"
-            column="PROP_ID"
-            type="string"
-            length="255"/>
+         name="propId"
+         column="PROP_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="PROP_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="PROP_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionRefs" table="jbp_cms_version_refs" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="refId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="refId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="REFS_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="REFS_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPBinVal" table="jbp_cms_wsp_binval" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="id"
-            column="BINVAL_ID"
-            type="string"
-            length="255"/>
+         name="id"
+         column="BINVAL_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="BINVAL_DATA"
-            type="blob"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="BINVAL_DATA"
+         type="blob"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPNode" table="jbp_cms_wsp_node" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="nodeId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="nodeId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="NODE_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="NODE_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPProp" table="jbp_cms_wsp_prop" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="propId"
-            column="PROP_ID"
-            type="string"
-            length="255"/>
+         name="propId"
+         column="PROP_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="PROP_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="PROP_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPRefs" table="jbp_cms_wsp_refs" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="refId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="refId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="REFS_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="REFS_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.CMSEntry" table="jbp_cms_cmsentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"
@@ -189,17 +212,17 @@
    </class>
    <class name="org.jboss.portal.cms.hibernate.RepositoryEntry" table="jbp_cms_repositoryentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"
@@ -221,17 +244,17 @@
    </class>
    <class name="org.jboss.portal.cms.hibernate.VersionEntry" table="jbp_cms_versionentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"

Modified: trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/cms/clustering/sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,15 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+   "-//Hibernate/Hibernate Configuration DTD//EN"
+   "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
    <session-factory>
       <property name="connection.datasource">java:TestPortalDS</property>
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">false</property>
       <property name="cache.use_query_cache">false</property>
-      
-      <!-- managed environment transaction configuration -->      
+
+      <!-- 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>
 

Modified: trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"

Modified: trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml
===================================================================
--- trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"

Modified: trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml
===================================================================
--- trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/cms/clustering/test-cms-clustering-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
    <listener>
       <listener-class>org.jboss.portal.test.cms.clustering.FileModSequenceBuilder</listener-class>
    </listener>

Modified: trunk/cms/src/resources/test/jcr/fs-repository.xml
===================================================================
--- trunk/cms/src/resources/test/jcr/fs-repository.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/jcr/fs-repository.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <Repository>
    <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
       <param name="path" value="${rep.home}/repository"/>

Modified: trunk/cms/src/resources/test/jcr/repository.xml
===================================================================
--- trunk/cms/src/resources/test/jcr/repository.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/jcr/repository.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,22 +1,45 @@
- <Repository>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ JBoss, a division of Red Hat                                              ~
+~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+~ contributors as indicated by the @authors tag. See the                    ~
+~ copyright.txt in the distribution for a full listing of                   ~
+~ individual contributors.                                                  ~
+~                                                                           ~
+~ This is free software; you can redistribute it and/or modify it           ~
+~ under the terms of the GNU Lesser General Public License as               ~
+~ published by the Free Software Foundation; either version 2.1 of          ~
+~ the License, or (at your option) any later version.                       ~
+~                                                                           ~
+~ This software is distributed in the hope that it will be useful,          ~
+~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+~ Lesser General Public License for more details.                           ~
+~                                                                           ~
+~ You should have received a copy of the GNU Lesser General Public          ~
+~ License along with this software; if not, write to the Free               ~
+~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<Repository>
     <!--
        | virtual file system where the repository stores global state (e.g. registered namespaces, custom node types, etc.)
        | Configure to use FS or RDBMS.
     -->
-    
-    <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
-    <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
+
+   <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
+   <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
        <param name="schemaObjectPrefix" value="CMSEntry"/>
        <param name="JNDIName" value="java:/SessionFactory"/>
     </FileSystem>
-    
-    <!-- LocalFileSystem: uses FileSystem for storage. -->
-    <!--
-       <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
-       <param name="path" value="${rep.home}/repository"/>
-       </FileSystem>
-    -->
-    <Security appName="Jackrabbit">
+
+   <!-- LocalFileSystem: uses FileSystem for storage. -->
+   <!--
+      <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+      <param name="path" value="${rep.home}/repository"/>
+      </FileSystem>
+   -->
+   <Security appName="Jackrabbit">
        <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"/>
        <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
           <!-- anonymous user name ('anonymous' is the default value) -->
@@ -26,7 +49,7 @@
     <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
     <Workspace name="${wsp.name}">
        <!-- Virtual file system of the workspace:  Configure to use FS or RDBMS. -->
-       
+
        <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
        <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
           <param name="schemaObjectPrefix" value="CMSEntry"/>
@@ -36,66 +59,66 @@
        <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
           <param name="path" value="${wsp.home}"/>
           </FileSystem>-->
-       
+
        <!--
           persistence manager of the workspace.
           Use XMLPersistenceManager for LocalFileSystem Store and HibernatePersistentManager .
        -->
-       
+
        <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
        <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager">
           <param name="schemaObjectPrefix" value="WSP"/>
           <param name="JNDIName" value="java:/SessionFactory"/>
           <param name="externalBLOBs" value="false"/>
        </PersistenceManager>
-       
+
        <!-- XMLPersistenceManager: uses FileSystem for storage -->
        <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
-       
+
        <!--SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
-          <param name="path" value="${wsp.home}/index"/>
-          <param name="useCompoundFile" value="true"/>
-          <param name="minMergeDocs" value="100"/>
-          <param name="volatileIdleTime" value="3"/>
-          <param name="maxMergeDocs" value="100000"/>
-          <param name="mergeFactor" value="10"/>
-          <param name="bufferSize" value="10"/>
-          <param name="cacheSize" value="1000"/>
-          <param name="forceConsistencyCheck" value="false"/>
-          <param name="autoRepair" value="true"/>
-          </SearchIndex-->
+       <param name="path" value="${wsp.home}/index"/>
+       <param name="useCompoundFile" value="true"/>
+       <param name="minMergeDocs" value="100"/>
+       <param name="volatileIdleTime" value="3"/>
+       <param name="maxMergeDocs" value="100000"/>
+       <param name="mergeFactor" value="10"/>
+       <param name="bufferSize" value="10"/>
+       <param name="cacheSize" value="1000"/>
+       <param name="forceConsistencyCheck" value="false"/>
+       <param name="autoRepair" value="true"/>
+       </SearchIndex-->
     </Workspace>
     <Versioning rootPath="${rep.home}/versions">
        <!--
           Configures the filesystem to use for versioning for the respective persistence manager
           Configure to use FS or RDBMS.
        -->
-       
+
        <!-- HibernateStore: uses RDBMS + Hibernate for storage -->
        <FileSystem class="org.jboss.portal.cms.hibernate.HibernateStore">
           <param name="schemaObjectPrefix" value="VersionEntry"/>
           <param name="JNDIName" value="java:/SessionFactory"/>
        </FileSystem>
-       
+
        <!-- LocalFileSystem: uses FileSystem for storage. -->
        <!--
           <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
           <param name="path" value="${rep.home}/versions"/>
           </FileSystem>
        -->
-       
+
        <!--
           Configures the persistence manager to be used for persisting version state.
           Use XMLPersistenceManager for LocalFileSystem Store and HibernatePersistentManager for HibernateStore.
        -->
-       
+
        <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage -->
        <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager">
           <param name="schemaObjectPrefix" value="Version"/>
           <param name="JNDIName" value="java:/SessionFactory"/>
           <param name="externalBLOBs" value="false"/>
        </PersistenceManager>
-       
+
        <!-- XMLPersistenceManager: uses FileSystem for storage -->
        <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
     </Versioning>

Modified: trunk/cms/src/resources/test/log4j.xml
===================================================================
--- trunk/cms/src/resources/test/log4j.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/log4j.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <!-- ===================================================================== -->
@@ -155,7 +178,7 @@
       </layout>
    </appender>
    -->
-   
+
    <!-- ================ -->
    <!-- Limit categories -->
    <!-- ================ -->
@@ -233,14 +256,14 @@
      <priority value="TRACE" class="org.jboss.logging.XLevel"/>
    </category>
    -->
-  
+
    <!--
        | Logs these events to SNMP:
            - server starts/stops
            - cluster evolution (node death/startup)
            - When an EJB archive is deployed (and associated verified messages)
            - When an EAR archive is deployed
-      	 
+
    <category name="org.jboss.system.server.Server">
      <priority value="INFO" />
      <appender-ref ref="TRAP_LOG"/>

Modified: trunk/cms/src/resources/test/pm-cache.xml
===================================================================
--- trunk/cms/src/resources/test/pm-cache.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/cms/src/resources/test/pm-cache.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!-- ===================================================================== -->
 <!--                                                                       -->
 <!--  Sample TreeCache Service Configuration                               -->
@@ -8,144 +31,143 @@
 
 <server>
     <!-- ==================================================================== -->
-    <!-- Defines TreeCache configuration                                      -->
-    <!-- ==================================================================== -->
+   <!-- Defines TreeCache configuration                                      -->
+   <!-- ==================================================================== -->
 
    <!-- TreeCache configuration used to cache CMS data -->
    <mbean code="org.jboss.cache.TreeCache"
-           name="cms.pm.cache:service=TreeCache">
+          name="cms.pm.cache:service=TreeCache">
    
            <depends>jboss:service=Naming</depends>
            <depends>jboss:service=TransactionManager</depends>
            <depends>portal:service=Hibernate,type=CMS</depends>
-   
-           <!--
-           Configure the TransactionManager
-           -->
-           <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-           
-           <!--
-		Node locking scheme:
-		OPTIMISTIC
-		PESSIMISTIC (default)
-		using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
-	   -->
-	   <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
-   
-           <!--
-               Isolation level : SERIALIZABLE
-                                 REPEATABLE_READ (default)
-                                 READ_COMMITTED
-                                 READ_UNCOMMITTED
-                                 NONE
-           -->
-           <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-           
-           	   
-   
-           <!--
-                Valid modes are LOCAL
-                                REPL_ASYNC
-                                REPL_SYNC
-                                INVALIDATION_ASYNC
-                                INVALIDATION_SYNC
-           -->
-           <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
-   
-           <!--
-           Just used for async repl: use a replication queue
-           -->
-           <attribute name="UseReplQueue">false</attribute>
-   
-           <!--
-               Replication interval for replication queue (in ms)
-           -->
-           <attribute name="ReplQueueInterval">0</attribute>
-   
-           <!--
-               Max number of elements which trigger replication
-           -->
-           <attribute name="ReplQueueMaxElements">0</attribute>
-   
-           <!-- Name of cluster. Needs to be the same for all clusters, in order
-                to find each other
-           -->
-           <attribute name="ClusterName">JCRPMCache</attribute>
-   
-           <!-- JGroups protocol stack properties. Can also be a URL,
-                e.g. file:/home/bela/default.xml
-              <attribute name="ClusterProperties"></attribute>
-           -->
-   
-           <attribute name="ClusterConfig">
+
+      <!--
+      Configure the TransactionManager
+      -->
+      <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+      <!--
+        Node locking scheme:
+        OPTIMISTIC
+        PESSIMISTIC (default)
+        using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
+        -->
+      <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name="UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name="ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name="ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all clusters, in order
+           to find each other
+      -->
+      <attribute name="ClusterName">JCRPMCache</attribute>
+
+      <!-- JGroups protocol stack properties. Can also be a URL,
+           e.g. file:/home/bela/default.xml
+         <attribute name="ClusterProperties"></attribute>
+      -->
+
+      <attribute name="ClusterConfig">
                <config>
                    <!-- UDP: if you have a multihomed machine,
                    set the bind_addr attribute to the appropriate NIC IP address -->
-                   <!-- UDP: On Windows machines, because of the media sense feature
-                    being broken with multicast (even after disabling media sense)
-                    set the loopback attribute to true -->
-                   <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-                       ip_ttl="64" ip_mcast="true"                       
+                  <!-- UDP: On Windows machines, because of the media sense feature
+            being broken with multicast (even after disabling media sense)
+            set the loopback attribute to true -->
+                  <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+                       ip_ttl="64" ip_mcast="true"
                        mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
                        ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
                        loopback="false"/>
                    <PING timeout="2000" num_initial_members="3"
-                       up_thread="false" down_thread="false"/>
+                         up_thread="false" down_thread="false"/>
                    <MERGE2 min_interval="10000" max_interval="20000"/>
-                   <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
-                   <FD_SOCK/>
+                  <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
+                  <FD_SOCK/>
                    <VERIFY_SUSPECT timeout="1500"
-                       up_thread="false" down_thread="false"/>
+                                   up_thread="false" down_thread="false"/>
                    <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-                       max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                                  max_xmit_size="8192" up_thread="false" down_thread="false"/>
                    <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-                       down_thread="false"/>
+                            down_thread="false"/>
                    <pbcast.STABLE desired_avg_gossip="20000"
-                       up_thread="false" down_thread="false"/>
+                                  up_thread="false" down_thread="false"/>
                    <FRAG frag_size="8192"
-                       down_thread="false" up_thread="false"/>
+                         down_thread="false" up_thread="false"/>
                    <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-                       shun="true" print_local_addr="true"/>
+                               shun="true" print_local_addr="true"/>
                    <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
                </config>
            </attribute>
-   
-           <!--
-            Whether or not to fetch state on joining a cluster
-            NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
-           -->
-           <attribute name="FetchInMemoryState">false</attribute>
-   
-           <!--
-               The max amount of time (in milliseconds) we wait until the
-               initial state (ie. the contents of the cache) are retrieved from
-               existing members in a clustered environment
-           -->
-           <attribute name="InitialStateRetrievalTimeout">20000</attribute>
-   
-           <!--
-               Number of milliseconds to wait until all responses for a
-               synchronous call have been received.
-           -->
-           <attribute name="SyncReplTimeout">20000</attribute>
-   
-           <!-- Max number of milliseconds to wait for a lock acquisition -->
-           <attribute name="LockAcquisitionTimeout">15000</attribute>
-   
-   
-           <!-- Name of the eviction policy class. -->
-           <attribute name="EvictionPolicyClass"></attribute>
-          
-          <!--
-             Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
-             class loader, e.g., inside an application server. Default is "false".
-          -->
-           <attribute name="UseRegionBasedMarshalling">false</attribute>
-           
-           <!--
-           	Configuring the JDBCCacheLoader
-           -->           
-           <attribute name="CacheLoaderConfiguration">
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
+      -->
+      <attribute name="FetchInMemoryState">false</attribute>
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          initial state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name="SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Name of the eviction policy class. -->
+      <attribute name="EvictionPolicyClass"></attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "false".
+      -->
+      <attribute name="UseRegionBasedMarshalling">false</attribute>
+
+      <!--
+         Configuring the JDBCCacheLoader
+      -->
+      <attribute name="CacheLoaderConfiguration">
                <config>                
                    <passivation>false</passivation>
                    <preload></preload>

Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
@@ -292,9 +315,9 @@
          <fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
          <fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
          <fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
-	      	
-	  	<!-- cms optimization integration - this contains a clustered cache enabled version -->
-	  	<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>	    
+
+         <!-- cms optimization integration - this contains a clustered cache enabled version -->
+         <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core-1.0.jar"/>
 	  	<fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
 	  	<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>		 
       	
@@ -548,27 +571,29 @@
          </x-sysproperty>
          <x-test>
             <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
-               outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
+                  outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
                <parameter name="PersistLocally" value="true"/>
                <parameter name="CloneOnCreate" value="true"/>
             </zest>
             <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
-               outfile="TEST-NotPersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
+                  outfile="TEST-NotPersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
                <parameter name="PersistLocally" value="false"/>
                <parameter name="CloneOnCreate" value="true"/>
             </zest>
             <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
-               outfile="TEST-PersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
+                  outfile="TEST-PersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
                <parameter name="PersistLocally" value="true"/>
                <parameter name="CloneOnCreate" value="false"/>
             </zest>
             <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
-               outfile="TEST-NotPersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
+                  outfile="TEST-NotPersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
                <parameter name="PersistLocally" value="false"/>
                <parameter name="CloneOnCreate" value="false"/>
             </zest>
-            <test todir="${test.reports}" name="org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>
          </x-test>
          <x-classpath>
             <pathelement location="${build.lib}/portal-core-lib.jar"/>

Modified: trunk/core/src/etc/jboss-aop/base-aop.xml
===================================================================
--- trunk/core/src/etc/jboss-aop/base-aop.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/etc/jboss-aop/base-aop.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE aop PUBLIC
    "-//JBoss//DTD JBOSS AOP 1.0//EN"
    "http://www.jboss.org/aop/dtd/jboss-aop_1_0.dtd">
@@ -61,7 +84,8 @@
       <advice name="execute" aspect="org.jboss.aspects.asynchronous.aspects.jboss.AsynchronousAspect"/>
    </bind>
 
-   <introduction expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
+   <introduction
+      expr="has(* *->@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous(..)) OR class(@org.jboss.aspects.asynchronous.aspects.jboss.Asynchronous)">
 
       <mixin>
          <interfaces>
@@ -80,8 +104,10 @@
       <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
    </bind>
 
-   <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory" scope="PER_INSTANCE"/>
+   <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
+                scope="PER_CLASS"/>
+   <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
+                scope="PER_INSTANCE"/>
 
    <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))">
       <interceptor-ref name="class-txsynchronized"/>
@@ -95,7 +121,8 @@
       <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
    </bind>
 
-   <bind pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
+   <bind
+      pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
       <interceptor-ref name="class-txsynchronized"/>
    </bind>
 
@@ -115,7 +142,8 @@
       <advice name="access" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
    </bind>
 
-   <bind pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
+   <bind
+      pointcut="execution(*->new(..)) AND hasfield(javax.transaction.TransactionManager *->@org.jboss.aspects.Injected)">
       <advice name="allocation" aspect="org.jboss.aspects.tx.TransactionManagerInjector"/>
    </bind>
 

Modified: trunk/core/src/main/org/jboss/portal/core/CoreConstants.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/CoreConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/CoreConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,58 +1,59 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller;
 
-import org.jboss.portal.core.controller.ControllerInterceptor;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerInterceptor;
 import org.jboss.portal.core.controller.command.RenderPageCommand;
 import org.jboss.portal.core.controller.command.SignOutCommand;
 import org.jboss.portal.core.controller.command.ViewDashboardCommand;
-import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
 import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
 import org.jboss.portal.identity.User;
-import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 import org.jboss.portal.security.PortalSecurityException;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
+import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.theme.PageRendition;
 import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.theme.page.WindowResult;
 import org.jboss.portal.theme.page.ModifiableWindowResult;
-import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.Region;
-import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.theme.page.WindowContext;
+import org.jboss.portal.theme.page.WindowResult;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
-import java.util.ResourceBundle;
+import java.util.Map;
 import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -61,9 +62,7 @@
 public class PageCustomizerInterceptor extends ControllerInterceptor
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static final String RESOURCE_PREFIX = "PAGENAME_";
 
    private PortalAuthorizationManagerFactory portalAuthorizationManagerFactory;

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.core.aspects.controller;
 
 import org.apache.log4j.Logger;
@@ -5,13 +28,13 @@
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.invocation.AttributeResolver;
 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.ControllerCommand;
+import org.jboss.portal.core.controller.command.PageCommand;
 import org.jboss.portal.core.controller.command.PortalObjectCommand;
 import org.jboss.portal.core.controller.command.RenderPageCommand;
 import org.jboss.portal.core.controller.command.WindowCommand;
-import org.jboss.portal.core.controller.command.PageCommand;
 import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.Portal;
 import org.jboss.portal.core.model.portal.PortalObject;

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/PolicyEnforcementInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller;
 
 
 import org.jboss.logging.Logger;
+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.ControllerCommand;
 import org.jboss.portal.core.controller.ControllerSecurityException;
-import org.jboss.portal.common.invocation.InvocationException;
+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.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>
+ * <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 at novell.com>Martin Holzner</a>
  * @author julien at jboss.org
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -57,6 +56,7 @@
    /**
     * @param cmd
     * @throws org.jboss.portal.common.invocation.InvocationException
+    *
     */
    public Object invoke(ControllerCommand cmd) throws Exception, InvocationException
    {
@@ -69,11 +69,11 @@
       }
       catch (PortalSecurityException e)
       {
-         if(isTrace)
+         if (isTrace)
          {
             log.error("Security Exception", e);
          }
          throw new ControllerSecurityException(e);
-      } 
-   } 
+      }
+   }
 }
\ No newline at end of file

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/WindowCacheInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/WindowCacheInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/WindowCacheInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller;
 
-import org.jboss.portal.core.controller.ControllerInterceptor;
+import org.jboss.portal.common.invocation.InvocationContext;
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.command.RenderWindowCommand;
+import org.jboss.portal.core.controller.ControllerInterceptor;
 import org.jboss.portal.core.controller.command.InvokeWindowCommand;
+import org.jboss.portal.core.controller.command.RenderWindowCommand;
 import org.jboss.portal.core.controller.command.WindowCommand;
 import org.jboss.portal.core.controller.command.response.PortletResponse;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.InvocationContext;
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.invocation.response.cache.TimedContent;
 import org.jboss.portal.portlet.invocation.response.cache.StrongTimedContent;
+import org.jboss.portal.portlet.invocation.response.cache.TimedContent;
 import org.jboss.portal.server.ServerInvocation;
 
 import java.io.Serializable;
@@ -138,9 +139,7 @@
       }
    }
 
-   /**
-    * Encapsulate cache information.
-    */
+   /** Encapsulate cache information. */
    public static class CacheEntry implements Serializable
    {
 

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/EventBroadcasterInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,57 +1,55 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller.node;
 
-import java.util.Map;
-
-import org.jboss.portal.core.controller.ControllerInterceptor;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.CommandRedirectionException;
-import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
-import org.jboss.portal.core.controller.command.InvokeWindowActionCommand;
-import org.jboss.portal.core.controller.command.WindowCommand;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.core.model.instance.Instance;
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
-import org.jboss.portal.portlet.Parameters;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvokerException;
+import org.apache.log4j.Logger;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.event.PortalNodeEvent;
-import org.jboss.portal.common.util.LazyMap;
 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.WindowEvent;
-import org.apache.log4j.Logger;
+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.command.InvokeWindowActionCommand;
+import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
+import org.jboss.portal.core.controller.command.WindowCommand;
+import org.jboss.portal.core.event.PortalEventListenerRegistry;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.StateString;
 
-/**
- *
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- */
+import java.util.Map;
+
+/** @author <a href="mailto:julien at jboss.org">Julien Viet</a> */
 public class EventBroadcasterInterceptor extends ControllerInterceptor
 {
 

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/Navigation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller.node;
 
 /**
@@ -28,9 +29,7 @@
 public class Navigation
 {
 
-   /**
-    * Enforce singleton.
-    */
+   /** Enforce singleton. */
    private Navigation()
    {
    }

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller.node;
 
+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.ControllerCommand;
+import org.jboss.portal.core.controller.command.RenderPageCommand;
 import org.jboss.portal.core.controller.command.WindowCommand;
-import org.jboss.portal.core.controller.command.RenderPageCommand;
+import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.common.invocation.InvocationException;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalNodeURLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller.node;
 
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.PortalNodeURL;
-import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
+import org.jboss.portal.core.controller.command.RenderPageCommand;
+import org.jboss.portal.core.controller.portlet.ControllerPortletInvocationContext;
+import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.spi.SecurityContext;
-import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.server.request.URLContext;
-import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
-import org.jboss.portal.core.controller.command.RenderPageCommand;
-import org.jboss.portal.core.controller.portlet.ControllerPortletInvocationContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/controller/node/PortalObjectNode.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.controller.node;
 
 import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.event.PortalNodeEvent;
+import org.jboss.portal.api.node.event.PortalNodeEventContext;
 import org.jboss.portal.api.node.event.PortalNodeEventListener;
-import org.jboss.portal.api.node.event.PortalNodeEventContext;
+import org.jboss.portal.common.path.RelativePathParser;
+import org.jboss.portal.core.event.PortalEventListenerRegistry;
 import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.event.PortalEventListenerRegistry;
-import org.jboss.portal.common.path.RelativePathParser;
 
-import java.util.Map;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
-import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -71,7 +72,7 @@
 
    /**
     * @param parentNode the parent node of this node
-    * @param object the wrapped portal object
+    * @param object     the wrapped portal object
     */
    private PortalObjectNode(PortalObjectNode parentNode, PortalObject object)
    {
@@ -80,7 +81,7 @@
    }
 
    /**
-    * @param object the wrapped portal object
+    * @param object    the wrapped portal object
     * @param childNode the child node creating that object
     */
    private PortalObjectNode(PortalObject object, PortalObjectNode childNode)
@@ -158,13 +159,13 @@
 
       //
       RelativePathParser cursor = new RelativePathParser(relativePath);
-      for (int i = cursor.next();i != RelativePathParser.NONE && node != null;i = cursor.next())
+      for (int i = cursor.next(); i != RelativePathParser.NONE && node != null; i = cursor.next())
       {
          switch (i)
          {
             case RelativePathParser.DOWN:
                String name = relativePath.substring(cursor.getOffset(), cursor.getOffset() + cursor.getLength());
-                node = node.getChild(name);
+               node = node.getChild(name);
                break;
             case RelativePathParser.UP:
                node = node.getParent();
@@ -199,7 +200,7 @@
       if (tmp.isEmpty() == false)
       {
          childrenMap = new HashMap();
-         for (Iterator i = tmp.iterator();i.hasNext();)
+         for (Iterator i = tmp.iterator(); i.hasNext();)
          {
             PortalObject childObject = (PortalObject)i.next();
             PortalObjectNode child = new PortalObjectNode(this, childObject);

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.portlet;
 
 import org.jboss.portal.common.invocation.InvocationException;

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.portlet;
 
-import org.jboss.portal.portlet.invocation.PortletInterceptor;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.transaction.Transactions;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.invocation.PortletInterceptor;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/server/LocaleInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.server;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -32,13 +33,11 @@
 import java.util.Locale;
 
 /**
- * If the user is authenticated and has a preferred locale then this one is chosen.
- * Otherwhise the locale used is the one determined by the incoming HttpServletRequest
- * provided by the servlet container.
- *
+ * If the user is authenticated and has a preferred locale then this one is chosen. Otherwhise the locale used is the
+ * one determined by the incoming HttpServletRequest provided by the servlet container.
+ * <p/>
  * todo add cookie or session based locales
  *
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/server/TransactionInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.server;
 
+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.transaction.TransactionManager;
 
 /**
  * This interceptor start and terminate a transaction around the request.
  *
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -39,8 +39,8 @@
 
    // Attributes ----------------------------------------------------
 
-    /** The JNDI context. */
-    private TransactionManager tm;
+   /** The JNDI context. */
+   private TransactionManager tm;
 
    // Static --------------------------------------------------------
 

Modified: trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.aspects.server;
 
 import org.jboss.logging.Logger;
@@ -41,12 +42,12 @@
 import java.util.Date;
 
 /**
- * The interceptor is responsible for managing the user identity lifecycle based
- * on the principal name returned by the <code>HttpServletRequest.getUserPrincipal()</code> method.
+ * The interceptor is responsible for managing the user identity lifecycle based on the principal name returned by the
+ * <code>HttpServletRequest.getUserPrincipal()</code> method.
+ * <p/>
+ * It manages also the user finalization that will set the last login date to the current value when the user is not
+ * used anymore.
  *
- * It manages also the user finalization that will set the last login date to the
- * current value when the user is not used anymore.
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -180,9 +181,7 @@
       }
    }
 
-   /**
-    * Implement the last login date feature.
-    */
+   /** Implement the last login date feature. */
    private static class UserFinalizer implements Serializable, HttpSessionBindingListener
    {
 

Modified: trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.cms;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.cms.CMS;
 import org.jboss.portal.cms.CMSException;
 import org.jboss.portal.cms.Command;
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
-import org.jboss.portal.core.cms.StreamContentCommand;
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory;
-import org.jboss.portal.Mode;
 import org.jboss.portal.portlet.ParametersStateString;
 import org.jboss.portal.server.ServerInvocation;
 
@@ -44,14 +44,10 @@
 public class CMSObjectCommandFactory extends AbstractCommandFactory
 {
 
-   /**
-    * .
-    */
+   /** . */
    protected CMS CMSService;
 
-   /**
-    * .
-    */
+   /** . */
    protected String targetWindowRef;
 
    public CMS getCMSService()
@@ -93,26 +89,26 @@
          }
 */
          Command getCMD = CMSService.getCommandFactory().createFileGetCommand(portalRequestPath, invocation.getRequest().getLocale());
-         File file = (File) CMSService.execute(getCMD);
-         if(file == null)
+         File file = (File)CMSService.execute(getCMD);
+         if (file == null)
          {
             getCMD = CMSService.getCommandFactory().createFileGetCommand(portalRequestPath, new Locale(CMSService.getDefaultLocale()));
-            file = (File) CMSService.execute(getCMD);
+            file = (File)CMSService.execute(getCMD);
          }
 
-         if(file != null)
+         if (file != null)
          {
             Content content = file.getContent();
 
-            if(content != null)
+            if (content != null)
             {
                boolean isStreamable = false;
-               if(!"text/html".equalsIgnoreCase(content.getMimeType()) && !"text/plain".equalsIgnoreCase(content.getMimeType()))
+               if (!"text/html".equalsIgnoreCase(content.getMimeType()) && !"text/plain".equalsIgnoreCase(content.getMimeType()))
                {
                   isStreamable = true;
                }
 
-               if(isStreamable)
+               if (isStreamable)
                {
                   return new StreamContentCommand(portalRequestPath);
                }
@@ -128,7 +124,7 @@
             }
          }
       }
-      catch(CMSException e)
+      catch (CMSException e)
       {
          log.error("CMS error", e);
       }

Modified: trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.cms;
 
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.core.controller.command.mapper.URLFactoryDelegate;
-import org.jboss.portal.core.cms.StreamContentCommand;
+import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerURL;
 
 /**
@@ -62,7 +62,7 @@
       {
          throw new IllegalArgumentException("No null command accepted");
       }
-      if(cmd instanceof StreamContentCommand)
+      if (cmd instanceof StreamContentCommand)
       {
          StringBuffer buffer = new StringBuffer();
 
@@ -73,7 +73,7 @@
          }
 
          //
-         StreamContentCommand scc = (StreamContentCommand) cmd;
+         StreamContentCommand scc = (StreamContentCommand)cmd;
          buffer.append(scc.getPath());
          AbstractServerURL asu = new AbstractServerURL();
          asu.setPortalRequestPath(buffer.toString());

Modified: trunk/core/src/main/org/jboss/portal/core/cms/StreamContentCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/cms/StreamContentCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/cms/StreamContentCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.cms;
 
 import org.jboss.mx.util.MBeanProxy;
@@ -28,11 +29,11 @@
 import org.jboss.portal.cms.model.Content;
 import org.jboss.portal.cms.model.File;
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerException;
 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.StreamContentResponse;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerException;
 import org.jboss.portal.server.ServerInvocation;
 
 import javax.management.MBeanServer;
@@ -53,7 +54,7 @@
    private String path;
 
    public StreamContentCommand(String path)
-         throws IllegalArgumentException
+      throws IllegalArgumentException
    {
       this.path = path;
    }
@@ -73,21 +74,21 @@
       try
       {
          MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
-         CMS CMSService = (CMS) MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+         CMS CMSService = (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
          ServerInvocation serverInvocation = getControllerContext().getServerInvocation();
          Command getCMD = CMSService.getCommandFactory().createFileGetCommand(path, serverInvocation.getRequest().getLocale());
-         File file = (File) CMSService.execute(getCMD);
-         if(file == null)
+         File file = (File)CMSService.execute(getCMD);
+         if (file == null)
          {
             getCMD = CMSService.getCommandFactory().createFileGetCommand(path, new Locale(CMSService.getDefaultLocale()));
-            file = (File) CMSService.execute(getCMD);
+            file = (File)CMSService.execute(getCMD);
          }
          Content content = file.getContent();
          String mimeType = content.getMimeType();
          InputStream inputStream = content.getStream();
          return new StreamContentResponse(mimeType, inputStream);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
 //         try
 //         {

Modified: trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSExportServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.cms.servlet;
 
 import org.jboss.portal.common.util.Tools;
@@ -31,7 +32,6 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedInputStream;
 
 /**
  * Used for archive export in CMS.
@@ -45,21 +45,21 @@
 
    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException
    {
-      String sPickupFile = (String) request.getSession().getAttribute("pickupfile");
+      String sPickupFile = (String)request.getSession().getAttribute("pickupfile");
 
       File file = new File(sPickupFile);
       try
       {
          //response.setContentType(getServletContext().getMimeType(file.getName()));
          response.setContentType("application/zip");
-         response.setContentLength((int) file.length());
+         response.setContentLength((int)file.length());
          response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
 
          InputStream in = Tools.safeBufferedWrapper(new FileInputStream(file));
          ServletOutputStream sout = response.getOutputStream();
          byte[] buf = new byte[2048];
          int len;
-         while((len = in.read(buf)) > 0)
+         while ((len = in.read(buf)) > 0)
          {
             sout.write(buf, 0, len);
          }
@@ -67,20 +67,20 @@
          sout.flush();
          sout.close();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          try
          {
             response.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
          }
-         catch(IOException e1)
+         catch (IOException e1)
          {
             e1.printStackTrace();
          }
       }
       finally
       {
-         if(!file.delete())
+         if (!file.delete())
          {
             file.deleteOnExit();
          }

Modified: trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/cms/servlet/CMSPreviewServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.cms.servlet;
 
 import org.jboss.mx.util.MBeanProxy;
@@ -38,9 +39,7 @@
 import java.io.InputStream;
 import java.util.Locale;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 public class CMSPreviewServlet extends HttpServlet
 {
    /** The serialVersionUID */
@@ -48,17 +47,17 @@
 
    public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException
    {
-      String path = (String) request.getParameter("p");
-      String version = (String) request.getParameter("v");
-      String language = (String) request.getParameter("l");
-     
+      String path = (String)request.getParameter("p");
+      String version = (String)request.getParameter("v");
+      String language = (String)request.getParameter("l");
+
       try
       {
          MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
-         CMS CMSService = (CMS) MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+         CMS CMSService = (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
 
          Command getCMD = CMSService.getCommandFactory().createFileGetCommand(path, version, new Locale(language));
-         File file = (File) CMSService.execute(getCMD);
+         File file = (File)CMSService.execute(getCMD);
          Content content = file.getContent();
 
          response.setContentType(content.getMimeType());
@@ -66,20 +65,20 @@
          InputStream is = content.getStream();
          byte[] buf = new byte[2048];
          int len;
-         while((len = is.read(buf)) > 0)
+         while ((len = is.read(buf)) > 0)
          {
             sout.write(buf, 0, len);
          }
          sout.flush();
          sout.close();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          try
          {
             response.sendError(HttpServletResponse.SC_NOT_FOUND, e.getMessage());
          }
-         catch(IOException e1)
+         catch (IOException e1)
          {
             e1.printStackTrace();
          }

Modified: trunk/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/CommandRedirectionException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
 import org.jboss.logging.Logger;
 import org.jboss.portal.common.invocation.Invocation;
-import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.invocation.InvocationContext;
-import org.jboss.portal.common.invocation.Scope;
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.common.invocation.InvocationHandler;
+import org.jboss.portal.common.invocation.Scope;
+import org.jboss.portal.core.controller.command.info.CommandInfo;
 import org.jboss.portal.security.PortalSecurityException;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
-import org.jboss.portal.core.controller.command.info.CommandInfo;
 
 /**
  * A controller command.
@@ -73,9 +74,7 @@
       setHandler(handler);
    }
 
-   /**
-    * Return the meta data of this command. 
-    */
+   /** Return the meta data of this command. */
    public abstract CommandInfo getInfo();
 
    public final InvocationContext getContext()
@@ -97,14 +96,13 @@
     *
     * @throws PortalSecurityException
     * @throws org.jboss.portal.core.controller.ControllerSecurityException
+    *
     */
    public void enforceSecurity(PortalAuthorizationManager pam) throws ControllerSecurityException, PortalSecurityException
    {
    }
 
-   /**
-    * Contextualize the command.
-    */
+   /** Contextualize the command. */
    public final void createContext(ControllerContext context) throws ControllerException
    {
       this.context = context;
@@ -113,9 +111,7 @@
       create();
    }
 
-   /**
-    * Destroy state after invocation.
-    */
+   /** Destroy state after invocation. */
    public final void destroyContext()
    {
       try
@@ -136,24 +132,22 @@
    {
    }
 
-   /**
-    * Execute the command.
-    */
+   /** Execute the command. */
    public abstract Object execute() throws ControllerException;
 
    public static void rethrow(Exception e) throws ControllerException, InvocationException, RuntimeException
    {
       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);
    }

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
+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.server.ServerInvocation;
+import org.jboss.portal.server.ServerURL;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.InterceptorStack;
-import org.jboss.portal.common.invocation.AbstractInvocationContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ControllerException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ControllerInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
 import org.jboss.portal.common.invocation.Invocation;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.server.impl.invocation.JBossInterceptor;
-import org.jboss.portal.core.controller.ControllerCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ControllerSecurityException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ControllerSecurityException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ControllerSecurityException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
-import org.jboss.portal.core.controller.ControllerException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/CoreController.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,71 +1,71 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.common.invocation.InterceptorStackFactory;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.core.controller.command.RenderPageCommand;
 import org.jboss.portal.core.controller.command.InvokeWindowActionCommand;
 import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
+import org.jboss.portal.core.controller.command.RenderPageCommand;
+import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
+import org.jboss.portal.core.controller.command.info.CommandInfo;
+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.PortletResponse;
 import org.jboss.portal.core.controller.command.response.StreamContentResponse;
 import org.jboss.portal.core.controller.command.response.UpdateViewResponse;
 import org.jboss.portal.core.controller.command.response.UpdateWindowMarkupResponse;
-import org.jboss.portal.core.controller.command.response.PortletResponse;
-import org.jboss.portal.core.controller.command.info.CommandInfo;
-import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
-import org.jboss.portal.core.controller.command.mapper.CommandFactory;
-import org.jboss.portal.core.controller.command.mapper.URLFactory;
 import org.jboss.portal.core.controller.portlet.SignOutResponse;
 import org.jboss.portal.core.model.instance.InstanceContainer;
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
 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.PortalObjectContainer;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.invocation.response.ErrorResponse;
+import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
+import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
+import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.RenderResponse;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 import org.jboss.portal.server.RequestController;
 import org.jboss.portal.server.ServerException;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerURL;
 import org.jboss.portal.server.request.URLContext;
+import org.jboss.portal.theme.PageRendition;
 import org.jboss.portal.theme.page.PageService;
-import org.jboss.portal.theme.PageRendition;
-import org.jboss.portal.portlet.invocation.response.RenderResponse;
-import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
-import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
-import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
-import org.jboss.portal.portlet.invocation.response.ErrorResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 
 /**
- *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -240,7 +240,7 @@
          {
             urlContext = URLContext.newInstance(urlContext.getSecure(), true);
             ServerURL serverURL = getURLFactory().doMapping(invocation, cmd);
-            String url = invocation.getResponse().encodeURL(serverURL, urlContext, null); 
+            String url = invocation.getResponse().encodeURL(serverURL, urlContext, null);
             sendRedirect(invocation, url);
          }
       }
@@ -367,7 +367,7 @@
          InputStream is = scr.getInputStream();
          byte[] buf = new byte[2048];
          int len;
-         while((len = is.read(buf)) > 0)
+         while ((len = is.read(buf)) > 0)
          {
             sout.write(buf, 0, len);
          }

Modified: trunk/core/src/main/org/jboss/portal/core/controller/InsufficientTransportGuaranteeException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/InsufficientTransportGuaranteeException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/InsufficientTransportGuaranteeException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
-import org.jboss.portal.core.controller.ControllerSecurityException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ResourceAccessDeniedException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ResourceAccessDeniedException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ResourceAccessDeniedException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
-import org.jboss.portal.core.controller.ControllerSecurityException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -33,7 +32,7 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 3506674156010581342L;
 
-   /** Object reference pointing to the not found object.  */
+   /** Object reference pointing to the not found object. */
    private String ref;
 
    public ResourceAccessDeniedException(String message, String ref)
@@ -48,9 +47,7 @@
       this.ref = ref;
    }
 
-   /**
-    * Return some kind of reference to the not found object.
-    */
+   /** Return some kind of reference to the not found object. */
    public String getRef()
    {
       return ref;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ResourceNotFoundException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ResourceNotFoundException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ResourceNotFoundException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller;
 
-import org.jboss.portal.core.controller.ControllerException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -33,7 +32,7 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = -1311521920998110717L;
 
-   /** Object reference pointing to the not found object.  */
+   /** Object reference pointing to the not found object. */
    private String ref;
 
    public ResourceNotFoundException(String ref)
@@ -42,9 +41,7 @@
       this.ref = ref;
    }
 
-   /**
-    * Return some kind of reference to the not found object.
-    */
+   /** Return some kind of reference to the not found object. */
    public String getRef()
    {
       return ref;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxController.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.ajax;
 
-import org.jboss.portal.server.RequestController;
-import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.ServerException;
 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.CoreController;
-import org.jboss.portal.core.controller.ControllerException;
 import org.jboss.portal.core.controller.command.MoveWindowCommand;
+import org.jboss.portal.server.RequestController;
+import org.jboss.portal.server.ServerException;
+import org.jboss.portal.server.ServerInvocation;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -44,7 +45,7 @@
 
       HttpServletRequest req = invocation.getServerContext().getClientRequest();
       String action = req.getParameter("action");
-      if ( "windowmove".equals(action))
+      if ("windowmove".equals(action))
       {
          String windowId = req.getParameter("windowId");
          String fromPos = req.getParameter("fromPos");

Modified: trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/ajax/AjaxInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.ajax;
 
+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.ControllerCommand;
 import org.jboss.portal.core.controller.command.RenderPageCommand;
-import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.theme.PageRendition;
 import org.jboss.portal.theme.ThemeConstants;
 

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowActionCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowActionCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowActionCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
 import org.jboss.logging.Logger;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.core.controller.portlet.ControllerActionContext;
-import org.jboss.portal.core.controller.command.response.PortletResponse;
-import org.jboss.portal.core.controller.command.info.CommandInfo;
-import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
+import org.jboss.portal.core.controller.ControllerContext;
 import org.jboss.portal.core.controller.ControllerException;
-import org.jboss.portal.core.controller.ControllerContext;
 import org.jboss.portal.core.controller.ResourceNotFoundException;
+import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
+import org.jboss.portal.core.controller.command.info.CommandInfo;
+import org.jboss.portal.core.controller.command.response.PortletResponse;
+import org.jboss.portal.core.controller.portlet.ControllerActionContext;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.portlet.PortletInvokerException;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
 import org.jboss.portal.Mode;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowRenderCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowRenderCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/InvokeWindowRenderCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,42 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.common.invocation.InvocationContext;
 import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.InvocationContext;
 import org.jboss.portal.core.aspects.controller.PageNavigationInterceptor;
+import org.jboss.portal.core.controller.ControllerCommand;
+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.controller.command.response.UpdateWindowMarkupResponse;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerContext;
+import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.theme.LayoutService;
+import org.jboss.portal.theme.navigation.WindowNavigationalState;
 import org.jboss.portal.theme.strategy.StrategyException;
-import org.jboss.portal.theme.navigation.WindowNavigationalState;
-import org.jboss.portal.theme.LayoutService;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/MoveWindowCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/MoveWindowCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/MoveWindowCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
+import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerException;
+import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
 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.ControllerCommand;
 import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.theme.ThemeConstants;
+import org.jboss.portal.theme.navigation.PageNavigationalState;
 import org.jboss.portal.theme.page.WindowContext;
-import org.jboss.portal.theme.navigation.PageNavigationalState;
-import org.jboss.portal.theme.ThemeConstants;
 
 import java.util.Iterator;
 
@@ -77,7 +78,7 @@
       PageNavigationalState pns = (PageNavigationalState)getContext().getAttribute(ControllerCommand.NAVIGATIONAL_STATE_SCOPE, page.getId());
 
       //
-      for (Iterator i = pns.getWindowContexts().iterator();i.hasNext();)
+      for (Iterator i = pns.getWindowContexts().iterator(); i.hasNext();)
       {
          WindowContext windowCtx = (WindowContext)i.next();
          String windowRegion = windowCtx.getRegionName();

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/PageCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/PageCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/PageCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
+import org.jboss.portal.core.controller.ControllerException;
+import org.jboss.portal.core.controller.ResourceNotFoundException;
+import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.controller.ResourceNotFoundException;
-import org.jboss.portal.core.controller.ControllerException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -59,11 +59,12 @@
     * Initialize the command
     *
     * @throws org.jboss.portal.common.invocation.InvocationException
+    *
     */
    public void create() throws ControllerException
    {
       super.create();
-      
+
       //
       page = (Page)getTarget();
 

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/PortalCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/PortalCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/PortalCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
-import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.controller.ControllerException;
 import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.controller.ControllerException;
-import org.jboss.portal.core.controller.ResourceNotFoundException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -55,6 +54,7 @@
     * Initialize the command
     *
     * @throws org.jboss.portal.common.invocation.InvocationException
+    *
     */
    public void create() throws ControllerException
    {

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/PortalObjectCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/PortalObjectCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/PortalObjectCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.controller.ControllerCommand;
+import org.jboss.portal.core.controller.ControllerException;
 import org.jboss.portal.core.controller.ControllerSecurityException;
 import org.jboss.portal.core.controller.ResourceAccessDeniedException;
-import org.jboss.portal.core.controller.ControllerException;
 import org.jboss.portal.core.controller.ResourceNotFoundException;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.PortalObjectPermission;
+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;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -76,14 +76,15 @@
     * Enforce the security on this command using the provided portal authorization manager.
     *
     * @param pam the portal authorization manager
-    * @throws org.jboss.portal.core.controller.ControllerSecurityException if the access is not granted
+    * @throws org.jboss.portal.core.controller.ControllerSecurityException
+    *          if the access is not granted
     */
    public void enforceSecurity(PortalAuthorizationManager pam) throws ControllerSecurityException, PortalSecurityException
    {
       PortalObject target = getTarget();
       String id = target.getId();
       PortalObjectPermission perm = new PortalObjectPermission(id, PortalObjectPermission.VIEW_MASK);
-      if(!pam.checkPermission(perm))
+      if (!pam.checkPermission(perm))
       {
          throw new ResourceAccessDeniedException("Not Authorized");
       }

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/RenderPageCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,87 +1,88 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.invocation.AttributeResolver;
 import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.common.invocation.AttributeResolver;
 import org.jboss.portal.common.util.Exceptions;
-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.portal.PortalObjectPermission;
-import org.jboss.portal.core.model.instance.Instance;
+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.ResourceNotFoundException;
 import org.jboss.portal.core.controller.ControllerSecurityException;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerContext;
 import org.jboss.portal.core.controller.InsufficientTransportGuaranteeException;
 import org.jboss.portal.core.controller.ResourceAccessDeniedException;
+import org.jboss.portal.core.controller.ResourceNotFoundException;
 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.PortletResponse;
-import org.jboss.portal.server.config.ServerConfig;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.PortalObjectPermission;
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.portlet.Properties;
+import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.WindowStateInfo;
+import org.jboss.portal.portlet.invocation.response.ErrorResponse;
+import org.jboss.portal.portlet.invocation.response.FragmentResponse;
+import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
+import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
+import org.jboss.portal.security.PortalSecurityException;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerInvocationContext;
+import org.jboss.portal.server.config.ServerConfig;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
+import org.jboss.portal.theme.LayoutService;
+import org.jboss.portal.theme.PageRendition;
+import org.jboss.portal.theme.PortalLayout;
+import org.jboss.portal.theme.PortalTheme;
+import org.jboss.portal.theme.ServerRegistrationID;
+import org.jboss.portal.theme.ThemeConstants;
+import org.jboss.portal.theme.ThemeResult;
+import org.jboss.portal.theme.ThemeService;
 import org.jboss.portal.theme.navigation.PageNavigationalState;
 import org.jboss.portal.theme.navigation.WindowNavigationalState;
 import org.jboss.portal.theme.page.ModifiablePageResult;
+import org.jboss.portal.theme.page.ModifiableWindowResult;
+import org.jboss.portal.theme.page.PageService;
 import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.theme.page.PageService;
-import org.jboss.portal.theme.page.ModifiableWindowResult;
 import org.jboss.portal.theme.render.MarkupResult;
-import org.jboss.portal.theme.PortalLayout;
-import org.jboss.portal.theme.PageRendition;
-import org.jboss.portal.theme.LayoutService;
-import org.jboss.portal.theme.PortalTheme;
-import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.theme.ThemeResult;
-import org.jboss.portal.theme.ThemeService;
-import org.jboss.portal.theme.ServerRegistrationID;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
-import org.jboss.portal.security.PortalSecurityException;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.portlet.Properties;
-import org.jboss.portal.portlet.info.WindowStateInfo;
-import org.jboss.portal.portlet.info.ModeInfo;
-import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
-import org.jboss.portal.portlet.invocation.response.FragmentResponse;
-import org.jboss.portal.portlet.invocation.response.ErrorResponse;
-import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
-import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.StringTokenizer;
 
 /**
@@ -239,7 +240,7 @@
          ModifiablePageResult renderResult = renderFragments(cfg, navCtx);
 
          // Make the theme available as servlet request attribute (needed for CM)
-         if(theme != null)
+         if (theme != null)
          {
             // render the theme markup and place it into the request so that the markup assembler (theme tag) can pick it up there
             ThemeResult themeResult = theme.assembleResponse(sinv.getRequest(), sinv.getResponse());
@@ -266,8 +267,8 @@
    }
 
    /**
-    * Call the component invocation(s) to create the markup fragment(s) for this request
-    * Call the component / portlet invocation for each window on the page, and create a markup result with the resulting markup fragments in it
+    * Call the component invocation(s) to create the markup fragment(s) for this request Call the component / portlet
+    * invocation for each window on the page, and create a markup result with the resulting markup fragments in it
     *
     * @param cfg    the server configuration to get access to customizable error behaviour
     * @param navCtx the navigational state context to access page and window navigational state

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/RenderWindowCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/RenderWindowCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/RenderWindowCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,44 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
-import org.jboss.portal.core.controller.portlet.ControllerRenderContext;
+import org.jboss.portal.Mode;
+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.ControllerException;
+import org.jboss.portal.core.controller.ResourceNotFoundException;
 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.PortletResponse;
-import org.jboss.portal.core.controller.ControllerException;
-import org.jboss.portal.core.controller.ControllerCommand;
-import org.jboss.portal.core.controller.ControllerContext;
-import org.jboss.portal.core.controller.ResourceNotFoundException;
-import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.core.controller.portlet.ControllerRenderContext;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.theme.navigation.WindowNavigationalState;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
 
 /**
  * Render a single window.

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/SignOutCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.core.controller.ControllerException;
+import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
 import org.jboss.portal.core.controller.command.info.CommandInfo;
-import org.jboss.portal.core.controller.command.info.ActionCommandInfo;
 import org.jboss.portal.core.controller.command.response.SignOutResponse;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/ViewDashboardCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/ViewDashboardCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/ViewDashboardCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
+import org.jboss.portal.core.controller.ControllerException;
+import org.jboss.portal.core.controller.ControllerSecurityException;
 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.PortalCommand;
-import org.jboss.portal.core.controller.command.response.UpdateWindowMarkupResponse;
 import org.jboss.portal.core.controller.command.response.UpdateViewResponse;
-import org.jboss.portal.core.controller.ControllerException;
-import org.jboss.portal.core.controller.ControllerSecurityException;
-import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
+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.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.security.PortalSecurityException;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -91,7 +90,7 @@
          {
             dashboardPage = portal.createPage(userId);
             Page templatePage = (Page)portal.getParent().getChild("default").getChild("default");
-            for (Iterator i = templatePage.getChildren().iterator();i.hasNext();)
+            for (Iterator i = templatePage.getChildren().iterator(); i.hasNext();)
             {
                PortalObject child = (PortalObject)i.next();
                if (child.getType() == PortalObject.TYPE_WINDOW)
@@ -99,7 +98,7 @@
                   Window window = (Window)child;
                   Window newWindow = dashboardPage.createWindow(window.getName());
                   newWindow.setInstanceRef(window.getInstanceRef());
-                  for (Iterator j = window.getDeclaredProperties().entrySet().iterator();j.hasNext();)
+                  for (Iterator j = window.getDeclaredProperties().entrySet().iterator(); j.hasNext();)
                   {
                      Map.Entry entry = (Map.Entry)j.next();
                      String name = (String)entry.getKey();

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/WindowCommand.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/WindowCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/WindowCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command;
 
-import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.model.portal.Page;
-import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.core.model.instance.Instance;
-import org.jboss.portal.core.model.instance.InstanceDefinition;
 import org.jboss.portal.core.controller.ControllerException;
-import org.jboss.portal.core.controller.ResourceNotFoundException;
 import org.jboss.portal.core.controller.ControllerSecurityException;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
+import org.jboss.portal.core.controller.ResourceNotFoundException;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.core.model.portal.Page;
+import org.jboss.portal.core.model.portal.Portal;
+import org.jboss.portal.core.model.portal.Window;
 import org.jboss.portal.security.PortalSecurityException;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 
 /**
  * A superclass for command that target a specific window.
@@ -129,7 +126,9 @@
     *
     * @param pam
     * @throws org.jboss.portal.core.controller.ControllerSecurityException
+    *
     * @throws org.jboss.portal.security.PortalSecurityException
+    *
     */
    public void enforceSecurity(PortalAuthorizationManager pam) throws ControllerSecurityException, PortalSecurityException
    {

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/info/ActionCommandInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.info;
 
 /**
@@ -37,9 +38,7 @@
       this.idempotent = idempotent;
    }
 
-   /**
-    * Return true if the command is idempotent, i.e it can be reinvoked again safely.
-    */
+   /** Return true if the command is idempotent, i.e it can be reinvoked again safely. */
    public boolean isIdempotent()
    {
       return idempotent;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/info/CommandInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.info;
 
 /**
- * Runtime meta data for a command, this object is immutable.  
+ * Runtime meta data for a command, this object is immutable.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -44,9 +45,9 @@
 
    /**
     * Is this command a secured command? If so, access rights to this command will be enforced via a security policy.
-    * <p>The default returns false. Extending command classes need to set the <code>isSecured</code> member variable to true
-    * in the command's constructor if they want to enforce access right checks for the command.</p>
-    * 
+    * <p>The default returns false. Extending command classes need to set the <code>isSecured</code> member variable to
+    * true in the command's constructor if they want to enforce access right checks for the command.</p>
+    *
     * @return true if this command requires security checks
     */
    public boolean isSecured()
@@ -54,9 +55,7 @@
       return secured;
    }
 
-   /**
-    * @return the associated action of this command for security checks (is the user allowed to call this action...)
-    */
+   /** @return the associated action of this command for security checks (is the user allowed to call this action...) */
    public String getAction()
    {
       return action;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/info/ViewCommandInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.info;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
+import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.core.controller.ControllerCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractURLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 import org.jboss.portal.jems.as.system.AbstractJBossService;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
+import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.core.controller.ControllerCommand;
 
 /**
- * The <code>CommandMapper</code> interface defines a service that can map an invocation to a command
- * and also provide a mapping from a command to an url.
+ * The <code>CommandMapper</code> interface defines a service that can map an invocation to a command and also provide a
+ * mapping from a command to an url.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -36,7 +37,7 @@
    /**
     * Create a command.
     *
-    * @param invocation the invocation
+    * @param invocation        the invocation
     * @param portalContextPath
     * @param portalRequestPath
     * @return the command or null if no command is recognized

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactoryDelegate.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactoryDelegate.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/CommandFactoryDelegate.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 import org.jboss.portal.core.controller.ControllerCommand;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 /**
@@ -32,7 +33,7 @@
    /**
     * Register a command mapper with the specified path
     *
-    * @param path the path to associate with
+    * @param path    the path to associate with
     * @param factory the mapper
     * @throws IllegalArgumentException if any argument is null or another mapper is already registered with the path
     */

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactoryService.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactoryService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingCommandFactoryService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.servlet.PathParser;
 import org.jboss.portal.server.servlet.PathMapping;
 import org.jboss.portal.server.servlet.PathMappingResult;
+import org.jboss.portal.server.servlet.PathParser;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -53,6 +53,7 @@
          {
             return this;
          }
+
          public Object getChild(Object parent, String name)
          {
             if (parent == this)
@@ -89,7 +90,7 @@
       {
          throw new IllegalArgumentException("no mapper");
       }
-      synchronized(this)
+      synchronized (this)
       {
          path = path.substring(1);
          if (factories.containsKey(path))
@@ -108,7 +109,7 @@
       {
          throw new IllegalArgumentException("no path");
       }
-      synchronized(this)
+      synchronized (this)
       {
          path = path.substring(1);
          if (!factories.containsKey(path))
@@ -121,7 +122,7 @@
       }
    }
 
-   public ControllerCommand doMapping(ServerInvocation invocation, String portalContextPath, String portalRequestPath) 
+   public ControllerCommand doMapping(ServerInvocation invocation, String portalContextPath, String portalRequestPath)
    {
       //
       if (portalRequestPath.length() == 0)

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/DelegatingURLFactoryService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
+import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.core.controller.ControllerCommand;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -72,7 +72,7 @@
       {
          throw new IllegalArgumentException("Command class name must not be null");
       }
-      synchronized(this)
+      synchronized (this)
       {
          Map copy = new HashMap(delegates);
          String[] classNames = factory.getCommandClassNames();
@@ -96,7 +96,7 @@
       {
          throw new IllegalArgumentException("Command class name must not be null");
       }
-      synchronized(this)
+      synchronized (this)
       {
          Map copy = new HashMap(delegates);
          for (Iterator i = copy.entrySet().iterator(); i.hasNext();)

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 import org.jboss.portal.core.controller.ControllerCommand;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/SimpleURLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
+import org.jboss.portal.core.controller.ControllerCommand;
+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.core.controller.ControllerCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
+import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.core.controller.ControllerCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -35,7 +36,7 @@
     * Create an url for the command.
     *
     * @param invocation the invocation
-    * @param cmd the command to encode
+    * @param cmd        the command to encode
     * @return the server url or null if this mapper cannot peform this operation
     */
    ServerURL doMapping(ServerInvocation invocation, ControllerCommand cmd);

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactoryDelegate.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactoryDelegate.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/mapper/URLFactoryDelegate.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.mapper;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/response/PortletResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/response/PortletResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/response/PortletResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.response;
 
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.response;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/response/StreamContentResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.response;
 
 import java.io.InputStream;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateViewResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateViewResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateViewResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.response;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateWindowMarkupResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateWindowMarkupResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/command/response/UpdateWindowMarkupResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.command.response;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/AuthenticateResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/portlet/AuthenticateResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/AuthenticateResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.portlet;
 
 import org.jboss.portal.portlet.invocation.response.RedirectionResponse;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerActionContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerActionContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerActionContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.portlet;
 
 import org.jboss.portal.Mode;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletInvocationContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletInvocationContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerPortletInvocationContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.portlet;
 
 import org.jboss.portal.Mode;
 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.ControllerCommand;
 import org.jboss.portal.core.controller.command.InvokeWindowActionCommand;
 import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.model.portal.Portal;
@@ -181,7 +182,7 @@
       return controllerContext.encodeURL(cmd, info, URLFormat.newInstance(relative, true));
    }
 
-  public PortletInvocation createInvocation()
+   public PortletInvocation createInvocation()
    {
       PortletInvocation invocation = newInvocation();
 

Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerRenderContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerRenderContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerRenderContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.portlet;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 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.spi.RenderContext;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.Mode;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.spi.RenderContext;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.WindowState;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/ControllerUserContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.portlet;
 
 import org.jboss.portal.common.util.Tools;

Modified: trunk/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.controller.portlet;
 
 import org.jboss.portal.portlet.invocation.response.RedirectionResponse;

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.deployment;
 
 import org.jboss.portal.core.metadata.ServiceMetaData;

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.deployment.jboss;
- 
+
 import org.jboss.deployment.DeploymentException;
 import org.jboss.logging.Logger;
 import org.jboss.portal.common.metadata.MetaData;
@@ -39,8 +40,8 @@
 import javax.xml.parsers.DocumentBuilder;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -188,7 +189,7 @@
          for (int i = 0; i < units.size(); i++)
          {
             Unit unit = (Unit)units.get(i);
-            if(isTrace)
+            if (isTrace)
             {
                log.trace(unit);
             }
@@ -222,7 +223,7 @@
                }
                else if (o == null)
                {
-                  log.warn("Cannot create portal object " + unit.metaData + " because the parent '" +  unit.parentRef + "' that the deployment descriptor references does not exist");
+                  log.warn("Cannot create portal object " + unit.metaData + " because the parent '" + unit.parentRef + "' that the deployment descriptor references does not exist");
                }
                else
                {
@@ -286,10 +287,9 @@
    }
 
 
-
    /**
     * Return factory
-    * 
+    *
     * @return @see ObjectDeploymentFactory
     */
    public ObjectDeploymentFactory getFactory()
@@ -297,34 +297,24 @@
       return factory;
    }
 
-   /**
-    * A unit of deployment in the deployment descriptor.
-    */
+   /** A unit of deployment in the deployment descriptor. */
    private static class Unit
    {
-      /**
-       * The strategy to use when the root object already exists.
-       */
+      /** The strategy to use when the root object already exists. */
       protected int ifExists;
 
-      /**
-       * The parent ref.
-       */
+      /** The parent ref. */
       protected String parentRef;
 
-      /**
-       * Meta data of the deployed portal object.
-       */
+      /** Meta data of the deployed portal object. */
       protected MetaData metaData;
 
-      /**
-       * The handle of the deployed object if not null.
-       */
+      /** The handle of the deployed object if not null. */
       protected String ref;
 
       public String toString()
       {
-         StringBuffer buffer = new StringBuffer("Unit[::ifExists="+ifExists);
+         StringBuffer buffer = new StringBuffer("Unit[::ifExists=" + ifExists);
          buffer.append(":parentRef=").append(parentRef);
          buffer.append(":Metadata=").append(metaData).append(":ref=").append(ref).append("]");
          return buffer.toString();

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,42 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.deployment.jboss;
 
+import org.jboss.deployment.DeploymentException;
+import org.jboss.portal.common.transaction.TransactionManagerProvider;
+import org.jboss.portal.core.model.portal.Context;
+import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.server.deployment.PortalWebApp;
 import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
-import org.jboss.portal.server.deployment.jboss.Deployment; 
-import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.Context;
-import org.jboss.portal.common.transaction.TransactionManagerProvider;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.portal.server.deployment.jboss.Deployment;
 
 import javax.management.MBeanServer;
 import javax.transaction.TransactionManager;
 import java.net.URL;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.regex.Matcher;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,42 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.mx.util.MBeanProxyExt;
+import org.jboss.portal.common.net.URLNavigator;
+import org.jboss.portal.common.net.URLVisitor;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.XML;
-import org.jboss.portal.common.net.URLNavigator;
-import org.jboss.portal.common.net.URLVisitor;
 import org.jboss.portal.core.metadata.InstanceMetaData;
 import org.jboss.portal.core.metadata.InstancesMetaData;
 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.InstanceContainer;
+import org.jboss.portal.portlet.InvalidPortletIdException;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.InvalidPortletIdException;
 import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 import org.jboss.portal.server.deployment.PortalWebApp;
 import org.w3c.dom.Document;
@@ -44,11 +45,11 @@
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.xml.parsers.DocumentBuilder;
+import java.io.File;
 import java.io.InputStream;
-import java.io.File;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -147,9 +148,11 @@
                public void startDir(URL url, String name)
                {
                }
+
                public void endDir(URL url, String name)
                {
                }
+
                public void file(URL url, String name)
                {
                   boolean logged = false;
@@ -161,7 +164,7 @@
                         in = Tools.safeBufferedWrapper(url.openStream());
                         Document doc = builder.parse(in);
                         Element deploymentsElt = doc.getDocumentElement();
-                        for (Iterator i = XML.getChildrenIterator(deploymentsElt, "deployment");i.hasNext();)
+                        for (Iterator i = XML.getChildrenIterator(deploymentsElt, "deployment"); i.hasNext();)
                         {
                            Element deploymentElt = (Element)i.next();
                            Element instanceElt = XML.getUniqueChild(deploymentElt, "instance", false);
@@ -284,9 +287,7 @@
       }
    }
 
-   /**
-    * Requires a transaction to execute, setup in aop configuration.
-    */
+   /** Requires a transaction to execute, setup in aop configuration. */
    private void createInstance(InstanceMetaData instanceMD)
    {
       try
@@ -308,14 +309,14 @@
       catch (NoSuchPortletException e)
       {
          String msg = "Failed to create instance " + instanceMD.getId() + " of portlet " + e.getPortletId() +
-                      " because portlet " + e.getPortletId() + " is not available";
+            " because portlet " + e.getPortletId() + " is not available";
          log.warn(msg);
          log.debug(msg, e);
       }
       catch (InvalidPortletIdException e)
       {
          String msg = "Failed to create instance " + instanceMD.getId() + " of portlet " + e.getPortletId() +
-                      " because portlet id " + e.getPortletId() + " is invalid";
+            " because portlet id " + e.getPortletId() + " is invalid";
          log.warn(msg);
          log.debug(msg, e);
       }

Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.deployment.jboss;
- 
-import org.jboss.portal.server.deployment.jboss.Deployment;
-import org.jboss.portal.server.deployment.PortalWebApp;
-import org.jboss.portal.core.model.instance.InstanceContainer;
-import org.jboss.portal.core.deployment.JBossApplicationMetaDataFactory;
+
 import org.jboss.deployment.DeploymentException;
+import org.jboss.portal.core.deployment.JBossApplicationMetaDataFactory;
+import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.server.deployment.PortalWebApp;
+import org.jboss.portal.server.deployment.jboss.Deployment;
 
 import javax.management.MBeanServer;
 import java.net.URL;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -59,9 +59,7 @@
       this.instanceContainer = instanceContainer;
    }
 
-   /**
-    * Return a subclass that does more.
-    */
+   /** Return a subclass that does more. */
    public org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory createJBossApplicationMetaDataFactory()
    {
       return new JBossApplicationMetaDataFactory();

Modified: trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.event;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerRegistryImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.event;
 
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -39,7 +39,7 @@
 
    public void registerListener(String id, Object listener)
    {
-      synchronized(this)
+      synchronized (this)
       {
          if (listeners.containsKey(id))
          {
@@ -53,7 +53,7 @@
 
    public void unregisterListener(String id)
    {
-      synchronized(this)
+      synchronized (this)
       {
          if (!listeners.containsKey(id))
          {
@@ -65,7 +65,7 @@
       }
    }
 
-   
+
    public Object getListener(String id)
    {
       return listeners.get(id);

Modified: trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.event;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/event/PortalEventListenerServiceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.event;
 
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.hibernate;
 
 import org.jboss.portal.Mode;

Modified: trunk/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.hibernate;
 
 import org.jboss.portal.WindowState;

Modified: trunk/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/invocation/Mapper.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.invocation;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.invocation;
 
 /**
@@ -29,13 +30,9 @@
  */
 public interface MappingContext
 {
-   /**
-    * Return the object graph root.
-    */
+   /** Return the object graph root. */
    Object getRoot();
 
-   /**
-    * Return the child object having the specified name or null if it does not exists.
-    */
+   /** Return the child object having the specified name or null if it does not exists. */
    Object getChild(Object parent, String name);
 }

Modified: trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/invocation/MappingResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.invocation;
 
 /**
@@ -54,8 +55,8 @@
    public int hashCode()
    {
       int hashCode = (target != null ? target.hashCode() : 0) +
-                     (targetPath != null ? targetPath.hashCode() : 0) +
-                     (targetPathInfo != null ? targetPathInfo.hashCode() : 0);
+         (targetPath != null ? targetPath.hashCode() : 0) +
+         (targetPathInfo != null ? targetPathInfo.hashCode() : 0);
       return hashCode;
    }
 
@@ -69,8 +70,8 @@
       {
          MappingResult other = (MappingResult)obj;
          return (target == null ? (other.target == null) : target.equals(other.target)) &&
-                (targetPath == null ? (other.targetPath == null) : targetPath.equals(other.targetPath)) &&
-                (targetPathInfo == null ? (other.targetPathInfo == null) : targetPathInfo.equals(other.targetPathInfo));
+            (targetPath == null ? (other.targetPath == null) : targetPath.equals(other.targetPath)) &&
+            (targetPathInfo == null ? (other.targetPathInfo == null) : targetPathInfo.equals(other.targetPathInfo));
       }
       return false;
    }

Modified: trunk/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/invocation/SimpleMapper.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.invocation;
 
 /**
- * A simple mapper implementation. The limitations is that
- * only the root and its children can have children
+ * A simple mapper implementation. The limitations is that only the root and its children can have children
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/mail/MailModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.mail;
 
 import EDU.oswego.cs.dl.util.concurrent.BoundedLinkedQueue;
@@ -29,6 +30,7 @@
 import org.jboss.logging.util.LoggerStream;
 import org.jboss.portal.core.modules.AbstractModule;
 import org.jboss.portal.core.modules.MailModule;
+
 import javax.mail.MessagingException;
 import javax.mail.PasswordAuthentication;
 import javax.mail.Session;
@@ -53,77 +55,49 @@
 {
    private final Logger log = Logger.getLogger(getClass());
 
-   /**
-    * Creates a new {@link MailModuleImpl} object.
-    */
+   /** Creates a new {@link MailModuleImpl} object. */
    public MailModuleImpl()
    {
    }
 
-   /**
-    * Javamail properties.
-    */
+   /** Javamail properties. */
    private Properties properties = new Properties();
 
-   /**
-    * Queue max capacity or -1 if unbounded.
-    */
+   /** Queue max capacity or -1 if unbounded. */
    private int queueCapacity = -1;
 
-   /**
-    * The thread that will send the mail.
-    */
+   /** The thread that will send the mail. */
    private QueuedExecutor executor;
 
-   /**
-    * The queue that will held all the messages.
-    */
+   /** The queue that will held all the messages. */
    private Channel queue;
 
-   /**
-    * The SMTP gateway through which mail will be delivered.
-    */
+   /** The SMTP gateway through which mail will be delivered. */
    public String gateway;
 
-   /**
-    * The username for authenticating to the smtp gateway.
-    */
+   /** The username for authenticating to the smtp gateway. */
    private String smtpUser;
 
-   /**
-    * The password for authenticating to the smtp gateway.
-    */
+   /** The password for authenticating to the smtp gateway. */
    private String smtpPassword;
 
-   /**
-    * The Authenticator implementation used when stmp auth is needed.
-    */
+   /** The Authenticator implementation used when stmp auth is needed. */
    private MailAuthenticator smtpAuth;
 
-   /**
-    * True if javamail debug is enabled.
-    */
+   /** True if javamail debug is enabled. */
    private boolean javaMailDebugEnabled = false;
 
-   /**
-    * SMTP connection timeout.
-    */
+   /** SMTP connection timeout. */
    private int SMTPConnectionTimeout = 10000;
 
-   /**
-    * SMTP timeout.
-    */
+   /** SMTP timeout. */
    private int SMTPTimeout = 10000;
 
-   /**
-    * The PrintStream java mail debug output is sent to.
-    */
+   /** The PrintStream java mail debug output is sent to. */
    private LoggerStream logs;
 
-   /**
-    * A serial id used to track messages locally.
-    */
-   private int     currentSerialId = 0;
+   /** A serial id used to track messages locally. */
+   private int currentSerialId = 0;
 
    public int getSMTPConnectionTimeout()
    {
@@ -188,7 +162,7 @@
       }
       else if (queue instanceof BoundedLinkedQueue)
       {
-         return ((BoundedLinkedQueue) queue).capacity();
+         return ((BoundedLinkedQueue)queue).capacity();
       }
       else
       {
@@ -201,7 +175,7 @@
       StringBuffer buffer = new StringBuffer("[");
       for (Iterator i = properties.entrySet().iterator(); i.hasNext(); buffer.append(i.hasNext() ? "," : "]"))
       {
-         Map.Entry entry = (Map.Entry) i.next();
+         Map.Entry entry = (Map.Entry)i.next();
          buffer.append(entry.getKey()).append("=").append(entry.getValue());
       }
 
@@ -213,7 +187,7 @@
       try
       {
          int size = 0;
-         for (MyMessage r = (MyMessage) queue.poll(0); r != null; r = (MyMessage) queue.poll(0))
+         for (MyMessage r = (MyMessage)queue.poll(0); r != null; r = (MyMessage)queue.poll(0))
          {
             log.debug("Removed serialId=" + r.serialId + " from the queue");
             size++;
@@ -266,7 +240,7 @@
    }
 
    protected void startService()
-   throws Exception
+      throws Exception
    {
       // Create the thread used to deliver messages
       if (queueCapacity > 0)
@@ -323,7 +297,7 @@
       }
    }
 
-   public boolean deliver(int    serialId,
+   public boolean deliver(int serialId,
                           String from,
                           String to,
                           String subject,
@@ -349,21 +323,21 @@
       return delivered;
    }
 
-   private boolean deliver(int    serialId,
+   private boolean deliver(int serialId,
                            String host,
                            String from,
                            String to,
                            String subject,
                            String body)
-   throws AddressException, 
-          NoSuchProviderException, 
-          MessagingException
+      throws AddressException,
+      NoSuchProviderException,
+      MessagingException
    {
       Transport transport = null;
       try
       {
          InternetAddress toAddress = new InternetAddress(to);
-         Session         session = Session.getDefaultInstance(properties, smtpAuth);
+         Session session = Session.getDefaultInstance(properties, smtpAuth);
          session.setDebug(javaMailDebugEnabled);
          session.setDebugOut(logs);
 
@@ -387,10 +361,10 @@
          // Send message
          log.debug("Sending message serialId=" + serialId);
          transport.sendMessage(message,
-                               new InternetAddress[]
-                               {
-                                  toAddress
-                               });
+            new InternetAddress[]
+               {
+                  toAddress
+               });
          log.debug("Sent msg, subject=" + subject + ", serialId=" + serialId);
          return true;
       }
@@ -409,9 +383,7 @@
       }
    }
 
-   /**
-    * Used for sending through a gateway needing authentication
-    */
+   /** Used for sending through a gateway needing authentication */
    private static class MailAuthenticator
       extends javax.mail.Authenticator
    {
@@ -421,8 +393,8 @@
       public MailAuthenticator(String username,
                                String password)
       {
-         this.username    = username;
-         this.password    = password;
+         this.username = username;
+         this.password = password;
       }
 
       public PasswordAuthentication getPasswordAuthentication()
@@ -431,13 +403,11 @@
       }
    }
 
-   /**
-    * Encapsulate a message in this class with a serial id version to keep track.
-    */
+   /** Encapsulate a message in this class with a serial id version to keep track. */
    private class MyMessage
       implements Runnable
    {
-      public final int    serialId;
+      public final int serialId;
 
       public final String from;
 
@@ -452,11 +422,11 @@
                        String subject,
                        String body)
       {
-         this.serialId    = currentSerialId++;
-         this.from        = from;
-         this.to          = to;
-         this.subject     = subject;
-         this.body        = body;
+         this.serialId = currentSerialId++;
+         this.from = from;
+         this.to = to;
+         this.subject = subject;
+         this.body = body;
       }
 
       public void run()

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/ContainerContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
-import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.hibernate.Session;
 import org.jboss.portal.portlet.PortletInvoker;
-import org.hibernate.Session;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.StateEvent;
 import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.state.PortletClonedEvent;
 import org.jboss.portal.portlet.state.PortletModifiedEvent;
-import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.core.model.instance.Instance;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceCustomizationImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
-import org.jboss.portal.portlet.PortletContext;
+import org.apache.log4j.Logger;
+import org.hibernate.Session;
+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.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.core.model.instance.InstanceCustomization;
-import org.jboss.portal.core.model.instance.InstanceContainer;
-import org.jboss.portal.core.model.instance.InstanceDefinition;
-import org.apache.log4j.Logger;
-import org.hibernate.Session;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -50,9 +51,7 @@
 
    protected boolean persistent;
 
-   /**
-    * Used to build transient instances.
-    */
+   /** Used to build transient instances. */
    public InstanceCustomizationImpl(InstanceDefinitionImpl def, String customizationId, ContainerContext containerContext, PortletContext portletContext)
    {
       super(containerContext);
@@ -80,9 +79,7 @@
       setPortletContext(portletContext);
    }
 
-   /**
-    * Used by hibernate.
-    */
+   /** Used by hibernate. */
    public InstanceCustomizationImpl()
    {
       this.customizationId = null;

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceDefinitionImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
+import org.apache.log4j.Logger;
+import org.hibernate.Session;
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.instance.InstanceDefinition;
-import org.jboss.portal.core.model.instance.InstanceCustomization;
 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.PortletContext;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.apache.log4j.Logger;
-import org.hibernate.Session;
-import org.hibernate.Query;
 
 import java.util.HashMap;
 import java.util.HashSet;

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,42 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
+import org.apache.log4j.Logger;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.core.model.instance.InstanceCustomization;
+import org.jboss.portal.jems.hibernate.ContextObject;
 import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.StatefulPortletContext;
 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.PropertyChange;
 import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.jems.hibernate.ContextObject;
-import org.jboss.portal.core.model.instance.Instance;
-import org.jboss.portal.core.model.instance.InstanceCustomization;
-import org.hibernate.Session;
-import org.hibernate.Query;
-import org.apache.log4j.Logger;
 
 import java.util.Arrays;
 import java.util.Set;
@@ -156,7 +157,6 @@
       }
       boolean debug = getLogger().isDebugEnabled();
 
-
       // Get the invoker
       PortletInvoker portletInvoker = containerContext.getPortletInvoker();
 
@@ -310,8 +310,6 @@
       return customization;
    }
 
-
-
    // ContextObject implementation *************************************************************************************
 
    public void setContext(Object context)

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceSecurityBinding.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
+import org.jboss.portal.core.model.instance.Instance;
+
 import java.io.Serializable;
 import java.util.Collections;
-import java.util.Set; 
-import java.util.StringTokenizer;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
+import java.util.StringTokenizer;
 
-import org.jboss.portal.core.model.instance.Instance;
-
 /**
  * Security Constraint for an instance
- * 
+ *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public final class InstanceSecurityBinding  implements Serializable
+public final class InstanceSecurityBinding implements Serializable
 {
 
    /** The serialVersionUID */
@@ -46,7 +47,7 @@
    private Long key;
 
    /** The role of this contraint. */
-   private  String role;
+   private String role;
 
    /** The set of actions of this constraint. */
    private Set actions;
@@ -71,7 +72,7 @@
     * Create a new constraint with the provided actions for the specified role.
     *
     * @param actions a comma separated list of allowed actions
-    * @param role the role name
+    * @param role    the role name
     */
    public InstanceSecurityBinding(String actions, String role)
    {
@@ -101,7 +102,7 @@
     * Create a new constraint with the provided actions and the specified role.
     *
     * @param actions the set of actions
-    * @param role the role name
+    * @param role    the role name
     */
    public InstanceSecurityBinding(Set actions, String role)
    {
@@ -119,9 +120,7 @@
       this.actions = Collections.unmodifiableSet(new HashSet(actions));
    }
 
-   /**
-    * Copy constructor.
-    */
+   /** Copy constructor. */
    public InstanceSecurityBinding(InstanceSecurityBinding other)
    {
       if (other == null)
@@ -164,7 +163,7 @@
       if (actionsAsString == null)
       {
          StringBuffer tmp = new StringBuffer();
-         for (Iterator i = actions.iterator();i.hasNext();)
+         for (Iterator i = actions.iterator(); i.hasNext();)
          {
             String action = (String)i.next();
             if (i.hasNext())
@@ -178,15 +177,13 @@
       return actionsAsString;
    }
 
-   /**
-    * @see Object#toString
-    */
+   /** @see Object#toString */
    public String toString()
    {
       if (toString == null)
       {
          StringBuffer tmp = new StringBuffer("SecurityConstraint: actions [");
-         for (Iterator i = actions.iterator();i.hasNext();)
+         for (Iterator i = actions.iterator(); i.hasNext();)
          {
             String action = (String)i.next();
             if (i.hasNext())

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/instance/PersistentInstanceContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.instance;
 
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.exception.ConstraintViolationException;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
+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.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.InstanceDefinition;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.jems.hibernate.ObjectContextualizer;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.PortletInvokerException;
-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.DestroyCloneFailure;
@@ -49,20 +55,15 @@
 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.hibernate.ObjectContextualizer;
-import org.jboss.portal.common.invocation.InterceptorStackFactory;
-import org.jboss.portal.common.invocation.InvocationHandler;
-import org.jboss.portal.common.invocation.Invocation;
-import org.jboss.portal.common.invocation.InvocationException;
 
 import javax.naming.InitialContext;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
 
 /**
  * Instance Container that is persistent
@@ -392,11 +393,11 @@
       {
          if (e instanceof PortletInvokerException)
          {
-            throw (PortletInvokerException)e;
+            throw(PortletInvokerException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/AbstractPortalObjectContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
+import org.jboss.portal.core.model.portal.Context;
+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.PortalObject;
-import org.jboss.portal.core.model.portal.Context;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 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.RoleSecurityBinding;
-import org.jboss.portal.security.spi.provider.PermissionFactory;
-import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 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 java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
-import java.util.Iterator;
-import java.util.HashSet;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -97,12 +98,12 @@
 
    public PortalPermission createPermission(String uri, String action) throws PortalSecurityException
    {
-      return new PortalObjectPermission(uri,action);
+      return new PortalObjectPermission(uri, action);
    }
 
    public PortalPermission createPermission(String uri, Collection actions) throws PortalSecurityException
    {
-      return new PortalObjectPermission(uri,actions);
+      return new PortalObjectPermission(uri, actions);
    }
 
    protected abstract ObjectNode getObjectNode(String id);
@@ -128,7 +129,7 @@
    public void removeSecurityBindings(String uri) throws SecurityConfigurationException
    {
       ObjectNode on = getObjectNode(uri);
-      if(on == null)
+      if (on == null)
       {
          throw new SecurityConfigurationException("The object should exist prior its security is configured : fixme");
       }
@@ -138,7 +139,7 @@
    public void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException
    {
       ObjectNode on = getObjectNode(uri);
-      if(on  == null)
+      if (on == null)
       {
          throw new SecurityConfigurationException("The object should exist prior its security is configured : fixme");
       }

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContainerContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
 import org.jboss.portal.core.model.portal.PortalObjectContainer;

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
 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.DuplicatePortalObjectException;
 import org.jboss.portal.core.model.portal.PortalObject;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
-import org.jboss.portal.core.model.portal.NoSuchPortalObjectException;
+import org.jboss.logging.Logger;
 import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
+import org.jboss.portal.core.model.portal.NoSuchPortalObjectException;
 import org.jboss.portal.jems.hibernate.ContextObject;
 import org.jboss.portal.security.RoleSecurityBinding;
-import org.jboss.logging.Logger;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -108,9 +109,7 @@
       this.object = object;
    }
 
-   /**
-    * Create the association.
-    */
+   /** Create the association. */
    void addChild(String name, PortalObjectImpl childObject) throws DuplicatePortalObjectException, IllegalArgumentException
    {
       if (name == null)
@@ -147,9 +146,7 @@
       childNode.parent = this;
    }
 
-   /**
-    * Destroy the association.
-    */
+   /** Destroy the association. */
    void removeChild(String name) throws NoSuchPortalObjectException, IllegalArgumentException
    {
       if (name == null)
@@ -165,7 +162,7 @@
       }
 
       // Destroy the children recursively
-      for (Iterator i = new ArrayList(child.getChildren().keySet()).iterator();i.hasNext();)
+      for (Iterator i = new ArrayList(child.getChildren().keySet()).iterator(); i.hasNext();)
       {
          String childName = (String)i.next();
          child.removeChild(childName);
@@ -257,7 +254,7 @@
       securityConstraints.clear();
       for (Iterator i = securityConstraints.values().iterator(); i.hasNext();)
       {
-         ObjectNodeSecurityConstraint onsc =  (ObjectNodeSecurityConstraint)i.next();
+         ObjectNodeSecurityConstraint onsc = (ObjectNodeSecurityConstraint)i.next();
          i.remove();
          onsc.setObjectNode(null);
       }
@@ -270,7 +267,7 @@
          // Optmize a bit
          if (sc.getActions().size() > 0)
          {
-            ObjectNodeSecurityConstraint onsc =  new ObjectNodeSecurityConstraint(sc.getActions(),sc.getRoleName());
+            ObjectNodeSecurityConstraint onsc = new ObjectNodeSecurityConstraint(sc.getActions(), sc.getRoleName());
 
             //
             onsc.setObjectNode(this);

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNodeSecurityConstraint.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
 import java.io.Serializable;
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 /**
- * Binds a role and a set of actions together. This object is immutable.
- * <p>A portal resource (portal, page, window, instance, portlet...) is secured via a set of security constraints.
- * each security constraint holds the information about what roles are allowed what actions.</p>
+ * Binds a role and a set of actions together. This object is immutable. <p>A portal resource (portal, page, window,
+ * instance, portlet...) is secured via a set of security constraints. each security constraint holds the information
+ * about what roles are allowed what actions.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -39,11 +40,11 @@
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -4506735776282080236L;
-   
+
    private long id;
 
    /** The role of this contraint. */
-   private  String role;
+   private String role;
 
    /** The set of actions of this constraint. */
    private Set actions;
@@ -52,9 +53,9 @@
    private transient String toString;
 
    /** The ObjectNode to which this security constraint is attached to . */
-   private ObjectNode objectNode; 
+   private ObjectNode objectNode;
 
-   
+
    public ObjectNodeSecurityConstraint()
    {
    }
@@ -63,7 +64,7 @@
     * Create a new constraint with the provided actions and the specified role.
     *
     * @param actions the set of actions
-    * @param role the role name
+    * @param role    the role name
     */
    public ObjectNodeSecurityConstraint(Set actions, String role)
    {
@@ -131,15 +132,13 @@
       return id;
    }
 
-   /**
-    * @see Object#toString
-    */
+   /** @see Object#toString */
    public String toString()
    {
       if (toString == null)
       {
          StringBuffer tmp = new StringBuffer("SecurityConstraint: actions [");
-         for (Iterator i = actions.iterator();i.hasNext();)
+         for (Iterator i = actions.iterator(); i.hasNext();)
          {
             String action = (String)i.next();
             if (i.hasNext())

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PageImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
+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.Window;
 import org.jboss.portal.core.model.portal.PortalObject;
+import org.jboss.portal.core.model.portal.Window;
 
-import java.util.Map;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
+import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.Query;
 import org.jboss.logging.Logger;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
+import org.jboss.portal.jems.hibernate.ObjectContextualizer;
 import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistry;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.jems.hibernate.ObjectContextualizer;
 
 import javax.naming.InitialContext;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -166,12 +166,10 @@
       sessionFactory = null;
    }
 
-   /**
-    * @see PortalObjectContainer#getAuthorizationDomain()
-    */
+   /** @see PortalObjectContainer#getAuthorizationDomain() */
    public AuthorizationDomain getAuthorizationDomain()
    {
-     return this;
+      return this;
    }
 
    public void createContext()
@@ -186,37 +184,35 @@
       }
    }
 
-   /**
-    * todo : use AOP for tx demarcation.
-    */
+   /** todo : use AOP for tx demarcation. */
    public void createContextIfNotExist() throws Exception
-    {
-       log.debug("Detecting the existence of the portal object root context");
-       Session session = sessionFactory.getCurrentSession();
+   {
+      log.debug("Detecting the existence of the portal object root context");
+      Session session = sessionFactory.getCurrentSession();
 
-       // Create root context if it does not exist
-       ObjectNode root = getObjectNode(session, "");
-       if (root == null)
-       {
-          // Bootstrap the root node
-          log.debug("The root context of the object tree does not exist, about to create it");
-          root = new ObjectNode(this.ctx, "", "");
-          session.save(root);
+      // Create root context if it does not exist
+      ObjectNode root = getObjectNode(session, "");
+      if (root == null)
+      {
+         // Bootstrap the root node
+         log.debug("The root context of the object tree does not exist, about to create it");
+         root = new ObjectNode(this.ctx, "", "");
+         session.save(root);
 
-          //
-          ContextImpl ctx = new ContextImpl();
-          root.setObject(ctx);
-          ctx.setObjectNode(root);
-          session.save(ctx);
+         //
+         ContextImpl ctx = new ContextImpl();
+         root.setObject(ctx);
+         ctx.setObjectNode(root);
+         session.save(ctx);
 
-          //
-          log.info("Created portal object root context");
-       }
-       else
-       {
-          log.debug("Portal object root context has been found");
-       }
-    }
+         //
+         log.info("Created portal object root context");
+      }
+      else
+      {
+         log.debug("Portal object root context has been found");
+      }
+   }
 
    //*******************************************************************
    //            AuthorizationDomain interface methods

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
+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.Page;
-import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
 import org.jboss.portal.core.model.portal.PortalObject;
 
+import java.util.HashSet;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/PortalObjectImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
+import org.apache.log4j.Logger;
+import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
+import org.jboss.portal.core.model.portal.NoSuchPortalObjectException;
 import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.NoSuchPortalObjectException;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
-import org.apache.log4j.Logger;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -131,46 +132,57 @@
             {
                return objectNode.getChildren().size();
             }
+
             public void clear()
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean isEmpty()
             {
                return objectNode.getChildren().isEmpty();
             }
+
             public Object[] toArray()
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean add(Object o)
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean contains(Object o)
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean remove(Object o)
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean addAll(Collection c)
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean containsAll(Collection c)
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean removeAll(Collection c)
             {
                throw new UnsupportedOperationException();
             }
+
             public boolean retainAll(Collection c)
             {
                throw new UnsupportedOperationException();
             }
+
             public Iterator iterator()
             {
                final Iterator iterator = objectNode.getChildren().values().iterator();
@@ -180,10 +192,12 @@
                   {
                      throw new UnsupportedOperationException();
                   }
+
                   public boolean hasNext()
                   {
                      return iterator.hasNext();
                   }
+
                   public Object next()
                   {
                      ObjectNode next = (ObjectNode)iterator.next();
@@ -191,6 +205,7 @@
                   }
                };
             }
+
             public Object[] toArray(Object a[])
             {
                ArrayList tmp = new ArrayList(objectNode.getChildren().size());
@@ -319,10 +334,7 @@
 
    public abstract int getType();
 
-   /**
-    * Return the default child of this object based on the declared property that specifies the default
-    * object name.
-    */
+   /** Return the default child of this object based on the declared property that specifies the default object name. */
    protected PortalObject getDefaultChild()
    {
       String portalName = getDeclaredProperty(PORTAL_PROP_DEFAULT_OBJECT_NAME);

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.portal;
 
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
-import org.jboss.portal.core.model.portal.Context;
-import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -52,12 +50,15 @@
          {
             return TransientPortalObjectContainer.this;
          }
+
          public void destroyChild(ObjectNode node)
          {
          }
+
          public void createChild(ObjectNode node)
          {
          }
+
          public void updated(ObjectNode node)
          {
          }
@@ -72,9 +73,7 @@
       ctx.setObjectNode(root);
    }
 
-   /**
-    * @see PortalObjectContainer#getAuthorizationDomain()
-    */
+   /** @see PortalObjectContainer#getAuthorizationDomain() */
    public AuthorizationDomain getAuthorizationDomain()
    {
       throw new IllegalStateException("Unimplemented");

Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/portal/WindowImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.model.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;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentState.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.portlet.state;
 
+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.ProducerStateContext;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.AbstractPropertyMap;
-import org.jboss.portal.common.value.Value;
 
-import java.util.Map;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
-import java.util.Date;
-import java.util.Calendar;
-import java.util.HashSet;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public class PersistentState 
+public class PersistentState
 {
 
    /** The primary key. */
@@ -197,10 +198,12 @@
             {
                return entries;
             }
+
             protected Object getInternalValue(Object value)
             {
                throw new IllegalArgumentException("Immutable");
             }
+
             protected Object getExternalValue(Object value)
             {
                PersistentStateEntry entry = (PersistentStateEntry)value;

Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateEntry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.portlet.state;
 
-import org.jboss.portal.common.value.Value;
 import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.value.Value;
 
 import java.io.Serializable;
 
@@ -100,9 +101,7 @@
       return name;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    public void setName(String name)
    {
       this.name = name;
@@ -116,9 +115,7 @@
       return type;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    public void setType(int type)
    {
       this.type = type;
@@ -143,9 +140,7 @@
       return strings;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    public void setStrings(String[] strings)
    {
       this.strings = strings;
@@ -171,9 +166,7 @@
       this.strings = value.asStringArray();
    }
 
-   /**
-    * Provide a default impl.
-    */
+   /** Provide a default impl. */
    public String toString()
    {
       StringBuffer buffer = new StringBuffer("[").append(name).append(",");
@@ -184,7 +177,7 @@
       else
       {
          buffer.append("(");
-         for (int i = 0;i < strings.length;i++)
+         for (int i = 0; i < strings.length; i++)
          {
             String s = strings[i];
             buffer.append(i > 0 ? "," : "").append(s);

Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/PersistentStateStore.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.portlet.state;
 
-import org.jboss.portal.portlet.state.producer.ProducerPersistenceManager;
-import org.jboss.portal.portlet.state.producer.ProducerStateContext;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.InvalidStateIdException;
 import org.jboss.portal.portlet.state.NoSuchStateException;
-import org.jboss.portal.portlet.state.InvalidStateIdException;
 import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.common.value.Value;
 import org.jboss.portal.portlet.state.SimplePropertyMap;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.hibernate.SessionFactory;
-import org.hibernate.Session;
-import org.hibernate.Query;
+import org.jboss.portal.portlet.state.producer.ProducerPersistenceManager;
+import org.jboss.portal.portlet.state.producer.ProducerStateContext;
 
 import javax.naming.InitialContext;
 import java.util.Iterator;
@@ -68,7 +69,7 @@
 
    public String createState(String portletId, PropertyMap propertyMap)
    {
-      if(portletId == null)
+      if (portletId == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }
@@ -91,7 +92,7 @@
 
    public String cloneState(String stateId, PropertyMap propertyMap) throws InvalidStateIdException, NoSuchStateException
    {
-      if(stateId == null)
+      if (stateId == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }
@@ -122,7 +123,7 @@
 
    public String cloneState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException
    {
-      if(stateId == null)
+      if (stateId == null)
       {
          throw new IllegalArgumentException("id cannot be null");
       }

Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ProducerPortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.portlet.state;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
-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.common.invocation.InvocationException;
 
 import java.util.List;
 
@@ -41,10 +42,12 @@
    {
       return super.createClone(portletContext);
    }
+
    public List destroyClones(List portletIds) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
    {
       return super.destroyClones(portletIds);
    }
+
    public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException, InvocationException
    {
       return super.invoke(invocation);

Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/TypedStringArray.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.portlet.state;
 
 /**
@@ -33,12 +34,10 @@
    /** The type. */
    private final int type;
 
-   /** The strings. */ 
+   /** The strings. */
    private final String[] strings;
 
-   /**
-    * @throws IllegalArgumentException if strings is null
-    */
+   /** @throws IllegalArgumentException if strings is null */
    public TypedStringArray(int type, String[] strings) throws IllegalArgumentException
    {
       if (strings == null)

Modified: trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/impl/portlet/state/ValueManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.impl.portlet.state;
 
-import org.jboss.portal.common.value.Value;
-import org.jboss.portal.common.value.IntegerValue;
 import org.jboss.portal.common.value.BooleanValue;
-import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.common.value.FloatValue;
-import org.jboss.portal.core.impl.portlet.state.TypedStringArray;
+import org.jboss.portal.common.value.IntegerValue;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.value.Value;
 
 /**
- * A manager handling type conversion.
- * For now we handle only basic types : java.lang.String, integer and boolean.
+ * A manager handling type conversion. For now we handle only basic types : java.lang.String, integer and boolean.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -52,7 +51,7 @@
 
    public static Value toValue(TypedStringArray tsa)
    {
-      switch(tsa.getType())
+      switch (tsa.getType())
       {
          case TYPE_INTEGER:
             return new IntegerValue(tsa.getStrings());

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,49 +1,50 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
+import org.apache.log4j.Logger;
 import org.jboss.portal.common.metadata.MetaData;
 import org.jboss.portal.common.util.XML;
-import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.common.value.Value;
+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.DuplicateInstanceException;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData;
-import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.security.RoleSecurityBinding;
+import org.jboss.portal.security.SecurityConstants;
+import org.jboss.portal.security.metadata.SecurityConstraintsMetaData;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
 import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
-import org.jboss.portal.security.RoleSecurityBinding;
-import org.jboss.portal.security.SecurityConstants;
-import org.jboss.portal.security.metadata.SecurityConstraintsMetaData;
 import org.w3c.dom.Element;
-import org.apache.log4j.Logger;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * Represent metadata of an instance.
@@ -123,7 +124,7 @@
       Element preferencesElt = XML.getUniqueChild(instanceElt, "preferences", false);
       if (preferencesElt != null)
       {
-         for (Iterator i = buildPreferencesMetaData(preferencesElt).values().iterator();i.hasNext();)
+         for (Iterator i = buildPreferencesMetaData(preferencesElt).values().iterator(); i.hasNext();)
          {
             PreferenceMetaData preferenceMD = (PreferenceMetaData)i.next();
             preferencesMD.addPreference(preferenceMD);
@@ -150,7 +151,7 @@
 
    /**
     * @param instanceElt the instance xml element
-    * @param pwaId the portlet application id
+    * @param pwaId       the portlet application id
     */
    public static InstanceMetaData buildLegacyMetaData(Element instanceElt, String pwaId)
    {
@@ -198,7 +199,7 @@
                Element preferencesElt = XML.getUniqueChild(instanceElt, "preferences", false);
                if (preferencesElt != null)
                {
-                  for (Iterator j = InstanceMetaData.buildPreferencesMetaData(preferencesElt).values().iterator();j.hasNext();)
+                  for (Iterator j = InstanceMetaData.buildPreferencesMetaData(preferencesElt).values().iterator(); j.hasNext();)
                   {
                      PreferenceMetaData preferenceMD = (PreferenceMetaData)j.next();
                      preferencesMD.addPreference(preferenceMD);
@@ -289,7 +290,7 @@
       {
          PropertyChange[] changes = new PropertyChange[preferences.size()];
          int idx = 0;
-         for (Iterator i = preferences.iterator();i.hasNext();)
+         for (Iterator i = preferences.iterator(); i.hasNext();)
          {
             PreferenceMetaData preference = (PreferenceMetaData)i.next();
             Value value = new StringValue(preference.getValues());

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
-import org.jboss.portal.common.util.XML; 
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.instance.NoSuchInstanceException;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.w3c.dom.Element;
 
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -59,6 +57,7 @@
    public interface BuildContext
    {
       InstanceContainer getContainer();
+
       String resolvePortletRef(String ref);
    }
 

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PageMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 import org.jboss.portal.common.util.XML;

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 import org.jboss.portal.Mode;

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PortalObjectMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 import org.jboss.logging.Logger;
@@ -27,11 +28,11 @@
 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.security.spi.provider.SecurityConfigurationException;
-import org.jboss.portal.security.spi.provider.DomainConfigurator;
 import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.SecurityConstants;
 import org.jboss.portal.security.metadata.SecurityConstraintsMetaData;
+import org.jboss.portal.security.spi.provider.DomainConfigurator;
+import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 import org.w3c.dom.Element;
 
 import java.util.HashMap;
@@ -113,7 +114,7 @@
    /**
     * Create an instance of the corresponding portal object.
     *
-    * @param parent the parent object
+    * @param parent       the parent object
     * @param buildContext the context
     * @return the corresponding portal object
     * @throws Exception any exception
@@ -232,21 +233,15 @@
       portalObjectMD.setListener(listener);
    }
 
-   /**
-    * Define the spi for creating a portal object.
-    */
+   /** Define the spi for creating a portal object. */
    public interface BuildContext
    {
       PortalObjectContainer getContainer();
-      
-      /**
-       * Resolve the instance reference.
-       */
+
+      /** Resolve the instance reference. */
       String resolveInstanceRef(String ref);
 
-      /**
-       * Resolve the parent ref
-       */
+      /** Resolve the parent ref */
       String resolveParentRef(String ref);
    }
 

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PreferencesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/PropertyHelper.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
+import org.apache.log4j.Logger;
+import org.jboss.portal.common.util.XML;
 import org.w3c.dom.Element;
-import org.jboss.portal.common.util.XML;
-import org.apache.log4j.Logger;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Helper class to handle properties / maps of properties.
@@ -40,7 +41,9 @@
    private static Logger log = Logger.getLogger(PropertyHelper.class);
 
    /**
-    * Convert the "property" child nodes of the provided node into a <code>java.util.Map</code> of property name and value.
+    * Convert the "property" child nodes of the provided node into a <code>java.util.Map</code> of property name and
+    * value.
+    *
     * @param propertiesElt the paret element in the Dom tree that will be inspected for 'property' child nodes
     * @return a Map of all the found properties, keyed by property name
     */

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/ProxyPreferencesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public class ProxyPreferencesMetaData 
+public class ProxyPreferencesMetaData
 {
 
    /** Proxy class for typed preferences. */

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/SecurityConstraintMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 import java.io.Serializable;
@@ -28,11 +29,10 @@
 import java.util.StringTokenizer;
 
 /**
- * Holder of information for one security constraint.
- * <p>A security constraint can be created by the deployer, containing the information of one
- * security-constraint element in the descriptor, or it can be created via a UI for dynamic
- * security policy creation. In both cases, the constraint will be added to the PortalPolicy for
- * the secured portal object.</p>
+ * Holder of information for one security constraint. <p>A security constraint can be created by the deployer,
+ * containing the information of one security-constraint element in the descriptor, or it can be created via a UI for
+ * dynamic security policy creation. In both cases, the constraint will be added to the PortalPolicy for the secured
+ * portal object.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/ServiceMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/WindowMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata;
 
 import org.jboss.portal.common.util.XML;
@@ -28,27 +29,19 @@
 import org.jboss.portal.theme.ThemeConstants;
 import org.w3c.dom.Element;
 
-import java.util.Set;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
 public class WindowMetaData extends PortalObjectMetaData
 {
-   /**
-    * The window region.
-    */
+   /** The window region. */
    protected String region;
 
-   /**
-    * The window order.
-    */
+   /** The window order. */
    protected int order;
 
-   /**
-    * The instance handle of this window.
-    */
+   /** The instance handle of this window. */
    protected String instanceRef;
 
    public String getInstanceRef()

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/portlet/HeaderContentMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata.portlet;
 
 import java.util.ArrayList;

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossApplicationMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata.portlet;
 
 import java.util.LinkedHashMap;

Modified: trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/metadata/portlet/JBossPortletMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.metadata.portlet;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/DuplicateInstanceException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/Instance.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.portlet.Portlet;
 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.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
 
 import java.util.Set;
 
@@ -87,8 +88,6 @@
     */
    void setProperties(PropertyChange[] changes) throws PortletInvokerException;
 
-   /**
-    * Return a customization.
-    */
+   /** Return a customization. */
    InstanceCustomization getCustomization(String customizationId);
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
- 
+
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.PortletInvoker;
 
 import java.util.Collection;
 
@@ -58,7 +59,7 @@
     * @param portletId the portlet id
     * @return the newly created instance
     * @throws DuplicateInstanceException if the instance already exist
-    * @throws IllegalArgumentException if the instance id is null
+    * @throws IllegalArgumentException   if the instance id is null
     */
    InstanceDefinition createInstance(String id, String portletId) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException;
 
@@ -67,10 +68,10 @@
     *
     * @param id
     * @param portletId the portlet id
-    * @param clone force a clone of the portlet
+    * @param clone     force a clone of the portlet
     * @return the newly created instance
     * @throws DuplicateInstanceException if the instance already exist
-    * @throws IllegalArgumentException if the instance id is null
+    * @throws IllegalArgumentException   if the instance id is null
     */
    InstanceDefinition createInstance(String id, String portletId, boolean clone) throws DuplicateInstanceException, IllegalArgumentException, PortletInvokerException;
 
@@ -87,11 +88,11 @@
     *
     * @return a collection containing the instances in the container
     */
-   Collection getInstances(); 
-   
+   Collection getInstances();
+
    /**
-    * Return the AuthorizationDomain 
-    * 
+    * Return the AuthorizationDomain
+    *
     * @return the authorization domain
     */
    AuthorizationDomain getAuthorizationDomain();

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceCustomization.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
 /**
@@ -28,9 +29,7 @@
 public interface InstanceCustomization extends Instance
 {
 
-   /**
-    * Return the identifier in the scope of its definition.
-    */
+   /** Return the identifier in the scope of its definition. */
    String getId();
 
    /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceDefinition.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
 /**
@@ -27,9 +28,7 @@
  */
 public interface InstanceDefinition extends Instance
 {
-   /**
-    * Return the identifier in the scope of its container.
-    */
+   /** Return the identifier in the scope of its container. */
    String getId();
 
    /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstancePermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
 import org.jboss.portal.security.PortalPermission;
@@ -28,9 +29,9 @@
 
 import javax.security.auth.Subject;
 import java.security.Permission;
-import java.util.StringTokenizer;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.StringTokenizer;
 
 /**
  * The permission for instance.
@@ -39,7 +40,7 @@
  * @version $Revision$
  */
 public final class InstancePermission extends PortalPermission
-{  
+{
 
    /** The serialVersionUID */
    private static final long serialVersionUID = 8445291296726152562L;
@@ -70,7 +71,7 @@
    public InstancePermission(String uri, Collection actions)
    {
       super("instancepermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -92,7 +93,7 @@
    public InstancePermission(String uri, String actions)
    {
       super("instancepermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/InstanceSecurityInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
 import org.jboss.logging.Logger;
@@ -26,7 +27,6 @@
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.security.PortalSecurityException;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
@@ -38,19 +38,13 @@
 public class InstanceSecurityInterceptor extends PortletInterceptor
 {
 
-   /**
-    * .
-    */
+   /** . */
    private Logger log = Logger.getLogger(InstanceSecurityInterceptor.class);
 
-   /**
-    * .
-    */
+   /** . */
    private boolean trace = log.isTraceEnabled();
 
-   /**
-    * .
-    */
+   /** . */
    private PortalAuthorizationManagerFactory pamf;
 
    public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory()

Modified: trunk/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/instance/NoSuchInstanceException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.instance;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/Context.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
-import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
-import org.jboss.portal.core.model.portal.Portal;
-
 /**
  * Contains nodes of type portal.
  *
@@ -32,9 +30,7 @@
  */
 public interface Context extends PortalObject
 {
-   /**
-    * Return an existing portal.
-    */
+   /** Return an existing portal. */
    Portal getPortal(String name);
 
    /**
@@ -46,9 +42,8 @@
    Portal createPortal(String name) throws DuplicatePortalObjectException, IllegalArgumentException;
 
    /**
-    * Get the default portal of the context based on some criteria. For instance
-    * a shared context get the portal with the "default" name, for a private
-    * portal it gets the only portal owned by the user. 
+    * Get the default portal of the context based on some criteria. For instance a shared context get the portal with
+    * the "default" name, for a private portal it gets the only portal owned by the user.
     */
    Portal getDefaultPortal();
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/DashboardCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/DashboardCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/DashboardCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 import org.jboss.portal.core.controller.ControllerCommand;

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/DefaultPortalCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
-import org.jboss.portal.core.controller.command.mapper.CommandFactory;
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.core.controller.command.RenderPageCommand;
 import org.jboss.portal.core.controller.command.mapper.AbstractCommandFactory;
+import org.jboss.portal.core.controller.command.mapper.CommandFactory;
 import org.jboss.portal.server.ServerInvocation;
 
 /**
- *
  * Return the default command if nothing has been found.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/DuplicatePortalObjectException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/NoSuchPortalObjectException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/Page.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/Page.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/Page.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 /**
@@ -27,14 +28,10 @@
  */
 public interface Page extends PageContainer
 {
-   /**
-    * Return the portal containing this page.
-    */
+   /** Return the portal containing this page. */
    Portal getPortal();
 
-   /**
-    * Get an existing windows.
-    */
+   /** Get an existing windows. */
    Window getWindow(String name);
 
    /**

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PageContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 /**
@@ -27,13 +28,9 @@
  */
 public interface PageContainer extends PortalObject
 {
-   /**
-    * Return an existing page.
-    */
+   /** Return an existing page. */
    Page getPage(String name);
 
-   /**
-    * Create a new page.
-    */
+   /** Create a new page. */
    Page createPage(String name) throws DuplicatePortalObjectException;
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/Portal.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/Portal.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/Portal.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 import java.util.Set;
@@ -29,19 +30,13 @@
  */
 public interface Portal extends PageContainer
 {
-   /**
-    * Return the window state provider of this portal.
-    */
+   /** Return the window state provider of this portal. */
    Set getSupportedWindowStates();
 
-   /**
-    * Return the mode provider of this portal.
-    */
+   /** Return the mode provider of this portal. */
    Set getSupportedModes();
 
-   /**
-    * Return an existing page.
-    */
+   /** Return an existing page. */
    Page getPage(String name);
 
    /**
@@ -52,8 +47,6 @@
     */
    Page createPage(String name) throws DuplicatePortalObjectException, IllegalArgumentException;
 
-   /**
-    * Return the default page.
-    */
+   /** Return the default page. */
    Page getDefaultPage();
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 import org.jboss.portal.portlet.spi.PortalContext;
 
+import java.util.Map;
 import java.util.Set;
-import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
-import java.util.Map;
 import java.util.Collection;
+import java.util.Map;
 
 /**
  * The base interface for all portal objects.
@@ -44,14 +45,10 @@
    int TYPE_PAGE = 2;
    int TYPE_WINDOW = 3;
 
-   /**
-    * Return the id in the scope of its container.
-    */
+   /** Return the id in the scope of its container. */
    String getId();
 
-   /**
-    * Return the container of this object.
-    */
+   /** Return the container of this object. */
    PortalObjectContainer getContainer();
 
    /**
@@ -75,9 +72,7 @@
     */
    String getListener();
 
-   /**
-    * Set a listener id.
-    */
+   /** Set a listener id. */
    void setListener(String listener);
 
    /**
@@ -110,28 +105,18 @@
     */
    void destroyChild(String name) throws NoSuchPortalObjectException, IllegalArgumentException;
 
-   /**
-    * Return a property of that object.
-    */
+   /** Return a property of that object. */
    String getProperty(String name);
 
-   /**
-    * Returns a read only map that contains the object properties.
-    */
+   /** Returns a read only map that contains the object properties. */
    Map getProperties();
 
-   /**
-    * Return a map that contains the object declared properties.
-    */
+   /** Return a map that contains the object declared properties. */
    Map getDeclaredProperties();
 
-   /**
-    * Return a property declared on that object.
-    */
+   /** Return a property declared on that object. */
    String getDeclaredProperty(String name);
 
-   /**
-    * Update a property declared on that object.
-    */
+   /** Update a property declared on that object. */
    void setDeclaredProperty(String name, String value);
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 import org.jboss.portal.Mode;
@@ -134,7 +135,7 @@
          }
 
          //
-         switch(decoder.getType())
+         switch (decoder.getType())
          {
             case PortletRequestDecoder.NAV_TYPE:
                cmd = new InvokeWindowRenderCommand(window.getId(), mode, windowState);

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
@@ -31,23 +32,15 @@
  */
 public interface PortalObjectContainer
 {
-   /**
-    * Create the root context.
-    */
+   /** Create the root context. */
    void createContext();
 
-   /**
-    * Return a container object.
-    */
+   /** Return a container object. */
    PortalObject getObject(String id);
 
-   /**
-    * Return the root context of this container.
-    */
+   /** Return the root context of this container. */
    Context getContext();
 
-   /**
-    * Get the authorization domain 
-    */
+   /** Get the authorization domain */
    AuthorizationDomain getAuthorizationDomain();
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
+import org.jboss.portal.identity.auth.UserPrincipal;
 import org.jboss.portal.security.PortalPermission;
 import org.jboss.portal.security.PortalPermissionCollection;
 import org.jboss.portal.security.PortalSecurityException;
 import org.jboss.portal.security.spi.provider.PermissionRepository;
-import org.jboss.portal.identity.auth.UserPrincipal;
 
 import javax.security.auth.Subject;
 import java.security.Permission;
-import java.util.StringTokenizer;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.StringTokenizer;
 
 /**
  * The permission for portal objects hierarchy.
@@ -41,14 +42,14 @@
  * @version $Revision$
  */
 public final class PortalObjectPermission extends PortalPermission
-{ 
+{
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -4796595968918579499L;
 
    /** The create action name. */
    public static final String CREATE_ACTION = "create";
-   
+
    /** The view action name. */
    public static final String VIEW_ACTION = "view";
 
@@ -66,17 +67,17 @@
 
    /** No Perms mask. */
    public static final int NONE_MASK = 0x00;
-   
+
    /** The view mask. */
    public static final int VIEW_MASK = 0x01;
-   
-   /**  The create mask. */
+
+   /** The create mask. */
    public static final int CREATE_MASK = 0x02;
 
-   /**  The create mask. */
+   /** The create mask. */
    public static final int PERSONALIZE_MASK = 0x04;
 
-   /**  The dashboard mask. */
+   /** The dashboard mask. */
    public static final int DASHBOARD_MASK = 0x08;
 
    /** The action names. */
@@ -104,7 +105,7 @@
       super("portalobjectpermission", uri);
 
       //
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -123,7 +124,7 @@
    public PortalObjectPermission(String uri, String actions)
    {
       super("portalobjectpermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -167,7 +168,7 @@
       else if (CREATE_ACTION.equals(action))
       {
          mask |= CREATE_MASK;
-      } 
+      }
       else if (PERSONALIZE_ACTION.equals(action))
       {
          mask |= PERSONALIZE_MASK;

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.core.controller.ControllerCommand;
 import org.jboss.portal.core.controller.command.InvokeWindowActionCommand;
@@ -28,15 +31,13 @@
 import org.jboss.portal.core.controller.command.InvokeWindowRenderCommand;
 import org.jboss.portal.core.controller.command.RenderPageCommand;
 import org.jboss.portal.core.controller.command.mapper.URLFactoryDelegate;
+import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.PortletRequestDecoder;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletRequestDecoder;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
 import org.jboss.portal.server.AbstractServerURL;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.portlet.Parameters;
 
 import java.util.Iterator;
 import java.util.Map;
@@ -50,11 +51,11 @@
 
    /** . */
    private static final String[] COMMAND_CLASS_NAMES =
-   {
-      RenderPageCommand.class.getName(),
-      InvokeWindowActionCommand.class.getName(),
-      InvokeWindowRenderCommand.class.getName()
-   };
+      {
+         RenderPageCommand.class.getName(),
+         InvokeWindowActionCommand.class.getName(),
+         InvokeWindowRenderCommand.class.getName()
+      };
 
    /** . */
    private String path;

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/Window.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/Window.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/Window.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
-import org.jboss.portal.core.model.portal.PortalObject;
-
 /**
  * Represents a window, i.e the state of the ternary relationship a page has with instances.
  *
@@ -31,13 +30,9 @@
  */
 public interface Window extends PortalObject
 {
-   /**
-    * Return the instance ref.
-    */
+   /** Return the instance ref. */
    String getInstanceRef();
 
-   /**
-    * Update the instance ref.
-    */
+   /** Update the instance ref. */
    void setInstanceRef(String instanceRef);
 }

Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/WindowContextImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/model/portal/WindowContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/model/portal/WindowContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.model.portal;
 
 import org.jboss.portal.portlet.spi.WindowContext;

Modified: trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/modules/AbstractModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.modules;
 
-import javax.naming.CompositeName;
-
 import org.jboss.naming.NonSerializableFactory;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
+import javax.naming.CompositeName;
+
 /**
  * Base class for modules. Provides JNDI facilities.
  *

Modified: trunk/core/src/main/org/jboss/portal/core/modules/MailModule.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/modules/MailModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/modules/MailModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.modules;
 
 
-/**
- * @author <a href="mailto:julien at jboss.com">Julien Viet</a>
- */
-public interface MailModule {
+/** @author <a href="mailto:julien at jboss.com">Julien Viet</a> */
+public interface MailModule
+{
 
-        void send(String from, String to, String subject, String body);      
+   void send(String from, String to, String subject, String body);
 
-        void setSMTPConnectionTimeout(int SMTPConnectionTimeout);
+   void setSMTPConnectionTimeout(int SMTPConnectionTimeout);
 
-        void setSMTPTimeout(int SMTPTimeout);
+   void setSMTPTimeout(int SMTPTimeout);
 
-        void setGateway(String gateway);
+   void setGateway(String gateway);
 
-        void setSmtpUser(String smtpUser);
+   void setSmtpUser(String smtpUser);
 
-        void setSmtpPassword(String smtpPassword);
+   void setSmtpPassword(String smtpPassword);
 
-        void setJavaMailDebugEnabled(boolean javaMailDebugEnabled);
+   void setJavaMailDebugEnabled(boolean javaMailDebugEnabled);
 }
\ No newline at end of file

Modified: trunk/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/modules/ModuleConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.modules;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class ModuleConstants
 {
 

Modified: trunk/core/src/main/org/jboss/portal/core/modules/ModuleException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/modules/ModuleException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/modules/ModuleException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.modules;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/PortletHelper.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet;
 
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 import org.jboss.logging.Logger;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.JBossPortlet;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$
- */
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class PortletHelper
 {
    private Logger log = Logger.getLogger(PortalJsp.class);

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/catalog/CatalogPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.catalog;
 
+import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
-import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.portlet.JBossPortlet;
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.portal.api.node.PortalNode;
 
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequestDispatcher;
@@ -40,7 +41,7 @@
  * @version $Revision$
  */
 public class CatalogPortlet
-      extends JBossPortlet
+   extends JBossPortlet
 {
 //   private PortalPermissionFactory permissionFactory;
 
@@ -94,32 +95,32 @@
 
          HashMap parentChildMap = new HashMap();
          HashMap parentSiblingMap = new HashMap();
-         for(Iterator i = parent.getParent().getChildren().iterator(); i.hasNext();)
+         for (Iterator i = parent.getParent().getChildren().iterator(); i.hasNext();)
          {
-            PortalNode parentSibling = (PortalNode) i.next();
+            PortalNode parentSibling = (PortalNode)i.next();
 
             // Display only sibling pages
-            if(parentSibling.getType() == PortalNode.TYPE_PAGE)
+            if (parentSibling.getType() == PortalNode.TYPE_PAGE)
             {
-               if(parentSibling.equals(parent))
+               if (parentSibling.equals(parent))
                {
-                  for(Iterator j = parent.getChildren().iterator(); j.hasNext();)
+                  for (Iterator j = parent.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)
                      {
                         boolean allowed = false;
                         // check if the current user is allowed to access this page
-                        if(child instanceof PortalObjectNode)
+                        if (child instanceof PortalObjectNode)
                         {
-                           PortalObjectNode pn = (PortalObjectNode) child;
+                           PortalObjectNode pn = (PortalObjectNode)child;
                            //allowed = permissionFactory.checkPermission("portalobject", pn.getHandle(), "view");
                            /*allowed = getPortalAuthorizationManager().hasPermission(pn.getRef(), "view",
                                  PermissionTypes.PAGE);*/
                            //For Now-allow
-                           allowed= true;
+                           allowed = true;
                         }
-                        if(allowed)
+                        if (allowed)
                         {
                            PortalNodeURL childURL = resp.createRenderURL(child);
                            parentChildMap.put(child.getName(), childURL);
@@ -131,16 +132,16 @@
                {
                   boolean allowed = false;
                   // check if the current user is allowed to access this page
-                  if(parentSibling instanceof PortalObjectNode)
+                  if (parentSibling instanceof PortalObjectNode)
                   {
-                     PortalObjectNode pn = (PortalObjectNode) parentSibling;
+                     PortalObjectNode pn = (PortalObjectNode)parentSibling;
                      //allowed = permissionFactory.checkPermission("portalobject", pn.getHandle(), "view");
                      /*allowed = getPortalAuthorizationManager().hasPermission(pn.getRef(), "view",
                            PermissionTypes.PAGE);*/
                      //For Now-allow
-                     allowed= true;
+                     allowed = true;
                   }
-                  if(allowed)
+                  if (allowed)
                   {
                      PortalNodeURL parentSiblingURL = resp.createRenderURL(parentSibling);
                      parentSiblingMap.put(parentSibling.getName(), parentSiblingURL);
@@ -154,7 +155,7 @@
          PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/catalog/index.jsp");
          prd.include(req, resp);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.cms;
 
 import org.apache.log4j.Logger;
@@ -62,41 +63,39 @@
 
    private String indexpage;
    /**
-    * It's easier and more robust to follow the standards.
-    * See  http://www.ietf.org/rfc/rfc2396.txt  of which, Section 3.1 on the
-    * "Scheme Component" is partially excerpted here:
+    * It's easier and more robust to follow the standards. See  http://www.ietf.org/rfc/rfc2396.txt  of which, Section
+    * 3.1 on the "Scheme Component" is partially excerpted here:
     * <p/>
-    * Just as there are many different methods of access to resources, there
-    * are a variety of schemes for identifying such resources...
+    * Just as there are many different methods of access to resources, there are a variety of schemes for identifying
+    * such resources...
     * <p/>
-    * Scheme names consist of a sequence of characters beginning with a lower
-    * case letter and followed by any combination of lower case letters,
-    * digits, plus ("+"), period ("."), or hyphen ("-"). For resiliency,
-    * programs interpreting URI should treat upper case letters as equivalent
-    * to lower case in scheme names (e.g., allow "HTTP" as well as "http").
+    * Scheme names consist of a sequence of characters beginning with a lower case letter and followed by any
+    * combination of lower case letters, digits, plus ("+"), period ("."), or hyphen ("-"). For resiliency, programs
+    * interpreting URI should treat upper case letters as equivalent to lower case in scheme names (e.g., allow "HTTP"
+    * as well as "http").
     * <p/>
     * scheme = alpha *( alpha | digit | "+" | "-" | "." )
     */
    private static final String URI_schemeRegex = "[a-z][-+.0-9a-z]*:";
 
    /**
-    * For our purposes, ignore URIs that start with a scheme idicator,
-    * a slash (indicating an absolute path), or a hash sign (# = ASCII hex 23).
+    * For our purposes, ignore URIs that start with a scheme idicator, a slash (indicating an absolute path), or a hash
+    * sign (# = ASCII hex 23).
     */
    private static final String URI_ignoreRegex = "" + URI_schemeRegex + "|/|\\x23";
    //private static final String URI_ignoreRegex = "(" + URI_schemeRegex + "|/|\\x23)";
 
    private static final String
-         regex = "((?:href|src)\\s*=\\s*)               # Capture preliminaries in $1.  \n"
-                 + "(?:                                   # First look for URL in quotes. \n"
-                 + "   ([\"\'])                           #   Capture open quote in $2.   \n"
-                 + "   (?!" + URI_ignoreRegex + ")        #   If it isn't absolute...     \n"
-                 + "   /?(.+?)                              #    ...capture URL in $3       \n"
-                 + "   \\2                                #   Match the closing quote     \n"
-                 + " |                                    # Look for non-quoted URL.      \n"
-                 + "   (?![\"\']|" + URI_ignoreRegex + ") #   If it isn't absolute...     \n"
-                 + "   /?([^\\s>]+)                         #    ...capture URL in $4       \n"
-                 + ")";
+      regex = "((?:href|src)\\s*=\\s*)               # Capture preliminaries in $1.  \n"
+      + "(?:                                   # First look for URL in quotes. \n"
+      + "   ([\"\'])                           #   Capture open quote in $2.   \n"
+      + "   (?!" + URI_ignoreRegex + ")        #   If it isn't absolute...     \n"
+      + "   /?(.+?)                              #    ...capture URL in $3       \n"
+      + "   \\2                                #   Match the closing quote     \n"
+      + " |                                    # Look for non-quoted URL.      \n"
+      + "   (?![\"\']|" + URI_ignoreRegex + ") #   If it isn't absolute...     \n"
+      + "   /?([^\\s>]+)                         #    ...capture URL in $4       \n"
+      + ")";
 
 /*   private static final String regex =
 "((?:href|src)\\s*=\\s*)     # Capture preliminaries in $1.  \n" +
@@ -110,9 +109,7 @@
 "   /?([^\\s>]+)             #    ...capture URL in $4       \n" +
 ")";*/
 
-   /**
-    * Removes header content, and leaves content between body tags
-    */
+   /** Removes header content, and leaves content between body tags */
    private static final String HTMLStripperRegex = "(.*<body[^>]*>(.+)</body>.*)";
    //private static final String HTMLStripperRegex = "(.*<body[^>]*>(.+)</body>.*')";
 
@@ -120,25 +117,19 @@
 
    private static final Pattern STRIP_TAGS_PATTERN = Pattern.compile(HTMLStripperRegex, Pattern.DOTALL | Pattern.CASE_INSENSITIVE);
 
-   /**
-    * Our path to jsp pages
-    */
+   /** Our path to jsp pages */
    static final String CMS_JSP_PATH = "/WEB-INF/jsp/cms";
 
-   /**
-    * Where we can find the default data in the resource bundle.
-    */
+   /** Where we can find the default data in the resource bundle. */
    static final String DEFAULT_PAGES_PATH = "/WEB-INF/jsp/cms/default";
 
-   /**
-    * Where we can find the default images in the resource bundle.
-    */
+   /** Where we can find the default images in the resource bundle. */
    static final String DEFAULT_IMAGES_PATH = "/images/cms";
 
    public void init() throws PortletException
    {
-      CMSService = (CMS) getPortletContext().getAttribute("CMS");
-      if(CMSService == null)
+      CMSService = (CMS)getPortletContext().getAttribute("CMS");
+      if (CMSService == null)
       {
          throw new PortletException("Cannot start CMS portlet due to service unavailability");
       }
@@ -151,7 +142,7 @@
          //      String linkMode = req.getPreferences().getValue("linkMode", LINK_MODE_PORTLET);
 //      boolean useCMSLink = LINK_MODE_CMS.equals(linkMode);
          String path = req.getParameter("path");
-         if(path == null)
+         if (path == null)
          {
             PortletPreferences prefs = req.getPreferences();
             indexpage = prefs.getValue("indexpage", "/default/index.html");
@@ -160,14 +151,14 @@
          // Get the file from the CMS, localized.
          Command fileGet;
          File file = null;
-         if(path == null)
+         if (path == null)
          {
             fileGet = CMSService.getCommandFactory().createFileGetCommand(indexpage, req.getLocale());
-            file = (File) CMSService.execute(fileGet);
-            if(file == null)                           
+            file = (File)CMSService.execute(fileGet);
+            if (file == null)
             {
                fileGet = CMSService.getCommandFactory().createFileGetCommand(indexpage, new Locale(CMSService.getDefaultLocale()));
-               file = (File) CMSService.execute(fileGet);
+               file = (File)CMSService.execute(fileGet);
             }
 /*
             Command itemExistsCMD = CMSService.getCommandFactory().createItemExistsCommand(indexpage + "/" + req.getLocale().getLanguage());
@@ -185,11 +176,11 @@
          else
          {
             fileGet = CMSService.getCommandFactory().createFileGetCommand(path, req.getLocale());
-            file = (File) CMSService.execute(fileGet);
-            if(file == null)
+            file = (File)CMSService.execute(fileGet);
+            if (file == null)
             {
                fileGet = CMSService.getCommandFactory().createFileGetCommand(path, new Locale(CMSService.getDefaultLocale()));
-               file = (File) CMSService.execute(fileGet);
+               file = (File)CMSService.execute(fileGet);
             }
 /*
             Command itemExistsCMD = CMSService.getCommandFactory().createItemExistsCommand(path + "/" + req.getLocale().getLanguage());
@@ -210,12 +201,12 @@
          // Translate links to resources.
          String sHTML = null;
          resp.setContentType("text/html");
-         if(file != null)
+         if (file != null)
          {
             sHTML = file.getContent().getContentAsString();
             // clean html and body tags
             Matcher h = STRIP_TAGS_PATTERN.matcher(sHTML);
-            while(h.find())
+            while (h.find())
             {
                //System.out.println(h.group(1) + " " + h.group(2));
                sHTML = h.group(2);
@@ -223,7 +214,7 @@
             // begin modifying links
             StringBuffer buffer = new StringBuffer();
             Matcher m = RELATIVE_URI_PATTERN.matcher(sHTML);
-            while(m.find())
+            while (m.find())
             {
                String relURI = m.group(3) != null ? m.group(3) : m.group(4);
                String absoluteURI = this.buildURL(resp, "/" + relURI);
@@ -238,7 +229,7 @@
             sHTML = buffer.toString();
 
             // use the content's title, if exists.
-            if(file.getContent().getTitle() != null && !"".equals(file.getContent().getTitle()))
+            if (file.getContent().getTitle() != null && !"".equals(file.getContent().getTitle()))
             {
                resp.setTitle(file.getContent().getTitle());
             }
@@ -252,7 +243,7 @@
          writer.write(sHTML);
          writer.close();
       }
-      catch(CMSException e)
+      catch (CMSException e)
       {
          log.error("CMS error", e);
       }
@@ -265,8 +256,8 @@
    public String buildURL(RenderResponse resp, String path)
    {
       StreamContentCommand cmd = new StreamContentCommand(path);
-      PortletInvocation invocation = ((JBossRenderResponse) resp).getInvocation();
-      ControllerPortletInvocationContext ccrc = (ControllerPortletInvocationContext) invocation.getContext();
+      PortletInvocation invocation = ((JBossRenderResponse)resp).getInvocation();
+      ControllerPortletInvocationContext ccrc = (ControllerPortletInvocationContext)invocation.getContext();
       return ccrc.encodeURL(cmd, null, true);
    }
 

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminConstants.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.cms.admin;
 
 /**
  * AdminCMS Portlet Constants
  *
- * @author Roy Russo : roy at jboss dot org
- *         Date: Dec 14, 2004
- *         Time: 5:15:03 PM
+ * @author Roy Russo : roy at jboss dot org Date: Dec 14, 2004 Time: 5:15:03 PM
  */
 public class CMSAdminConstants
 {
 
-   /**
-    * Our path to jsp pages *
-    */
+   /** Our path to jsp pages * */
    public static final String CMS_JSP_PATH = "/WEB-INF/jsp/cms/admin";
 
-   /**
-    * Where we can find the admin images in the resource bundle.
-    */
+   /** Where we can find the admin images in the resource bundle. */
    public static final String DEFAULT_IMAGES_PATH = "/images/cms/admin";
 
    public static final String OP_MAIN = "main";

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/cms/admin/CMSAdminPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.cms.admin;
 
 import org.apache.commons.fileupload.FileItem;
@@ -263,7 +264,7 @@
 
          rRes.setContentType("text/html");
          rReq.setAttribute("currpath", sPath);
-         rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rRes, "/"));         
+         rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rRes, "/"));
          javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/create.jsp");
          prd.include(rReq, rRes);
       }
@@ -295,11 +296,11 @@
          //         String sCSSURL = sCSSHref.substring(sCSSHref.indexOf("href='") + 6, sCSSHref.lastIndexOf(".css'") + 4);
          String sCSSURL = cssLink.getAttributeValue("href");
          rReq.setAttribute("css_url", sbUrl.toString() + sCSSURL);
-         */         
+         */
 
          rRes.setContentType("text/html");
          rReq.setAttribute("currpath", sPath);
-         rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rRes, "/"));         
+         rReq.setAttribute("document_base_url", sbUrl.toString() + this.buildURL(rRes, "/"));
 
 
          Command getCommand;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/login/LoginPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.login;
 
 import org.apache.log4j.Logger;
@@ -33,7 +34,6 @@
 import java.io.IOException;
 
 /**
- * 
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$
  */

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/AbstractAuthorizationBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.faces.el.PropertyAccessor;
-import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 
 import javax.faces.model.SelectItem;
-import java.util.Set;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -54,10 +55,12 @@
          {
             return String[].class;
          }
+
          public Object getValue(Object propertyName)
          {
             return getActionsForRole((String)propertyName);
          }
+
          public void setValue(Object propertyName, Object value)
          {
             setActionsForRole((String)propertyName, (String[])value);
@@ -123,9 +126,7 @@
       }
    }
 
-   /**
-    * Return the roles.
-    */
+   /** Return the roles. */
    public String[] getRoles()
    {
       String uri = getURI();

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
 import org.jboss.logging.Logger;
-import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.value.Value;
-import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.instance.NoSuchInstanceException;
@@ -37,8 +37,9 @@
 import org.jboss.portal.identity.RoleModule;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.info.PreferencesInfo;
 import org.jboss.portal.portlet.info.MetaInfo;
+import org.jboss.portal.portlet.info.PreferencesInfo;
+import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.security.AuthorizationDomainRegistry;
 import org.jboss.portal.security.SecurityConstants;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
@@ -48,13 +49,13 @@
 import javax.faces.model.SelectItem;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.Comparator;
-import java.util.Collections;
-import java.util.Locale;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -64,49 +65,31 @@
 public class InstanceManagerBean
 {
 
-   /**
-    * .
-    */
+   /** . */
    private Logger log = Logger.getLogger(getClass());
 
-   /**
-    * .
-    */
+   /** . */
    private InstanceContainer instanceContainer;
 
-   /**
-    * .
-    */
+   /** . */
    private String selectedId;
 
-   /**
-    * .
-    */
+   /** . */
    private String selectedPlugin;
 
-   /**
-    * .
-    */
+   /** . */
    private AuthorizationDomainRegistry authorizationDomainRegistry;
 
-   /**
-    * .
-    */
+   /** . */
    private RoleModule roleModule;
 
-   /**
-    * .
-    */
+   /** . */
    private PreferencesBean selectedPreferences;
 
-   /**
-    * .
-    */
+   /** . */
    private AbstractAuthorizationBean auth = new AuthorizationBean();
 
-   /**
-    * .
-    */
+   /** . */
    private Integer selectedRow;
 
    private String sortColumn;
@@ -231,9 +214,7 @@
       return auth;
    }
 
-   /**
-    * Return an array of all instances known in this container.
-    */
+   /** Return an array of all instances known in this container. */
    public Collection getInstances()
    {
       List instances = new ArrayList();
@@ -312,9 +293,7 @@
       }
    }
 
-   /**
-    * Refresh the selected prefs.
-    */
+   /** Refresh the selected prefs. */
    public void refresh()
    {
       selectedPreferences = null;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/LazyPortalObjectTreeNode.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
 import org.apache.myfaces.custom.tree2.TreeNode;
-import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.Context;
+import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.Portal;
-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 java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
 import org.apache.myfaces.custom.tree2.HtmlTree;
 import org.apache.myfaces.custom.tree2.TreeModel;
 import org.apache.myfaces.custom.tree2.TreeModelBase;
 import org.apache.myfaces.custom.tree2.TreeNode;
+import org.jboss.logging.Logger;
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.common.MediaType;
 import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.core.aspects.controller.node.Navigation;
+import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.core.model.portal.Context;
@@ -35,8 +40,6 @@
 import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.PortalObjectContainer;
 import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.aspects.controller.node.Navigation;
-import org.jboss.portal.core.impl.model.portal.PortalObjectImpl;
 import org.jboss.portal.faces.el.DelegatingPropertyResolver;
 import org.jboss.portal.faces.el.PropertyDef;
 import org.jboss.portal.faces.el.TypeDef;
@@ -58,8 +61,6 @@
 import org.jboss.portal.theme.ThemeService;
 import org.jboss.portal.theme.render.PortalRenderSet;
 import org.jboss.portal.theme.strategy.LayoutStrategy;
-import org.jboss.portal.api.node.PortalNode;
-import org.jboss.logging.Logger;
 import org.jboss.portlet.JBossRenderResponse;
 
 import javax.faces.application.FacesMessage;
@@ -75,25 +76,21 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.LinkedList;
 
-/**
- * The portal object manager bean.
- */
+/** The portal object manager bean. */
 public class PortalObjectManagerBean implements Serializable
 {
 
    private Logger log = Logger.getLogger(getClass());
 
-   /**
-    * The serialVersionUID
-    */
+   /** The serialVersionUID */
    private static final long serialVersionUID = -8923517554726982622L;
 
    static
@@ -159,69 +156,43 @@
       DelegatingPropertyResolver.registerTypeDef(portletDef);
    }
 
-   /**
-    * The selected id.
-    */
+   /** The selected id. */
    private String selectedId;
 
-   /**
-    * The selected node properties.
-    */
+   /** The selected node properties. */
    private List selectedProperties;
 
-   /**
-    * The current tab name.
-    */
+   /** The current tab name. */
    private String selectedPlugin;
 
-   /**
-    * .
-    */
+   /** . */
    private RoleModule roleModule;
 
-   /**
-    * .
-    */
+   /** . */
    private PortalObjectContainer portalObjectContainer;
 
-   /**
-    * .
-    */
+   /** . */
    private InstanceContainer instanceContainer;
 
-   /**
-    * .
-    */
+   /** . */
    private LayoutService layoutService;
 
-   /**
-    * .
-    */
+   /** . */
    private ThemeService themeService;
 
-   /**
-    * .
-    */
+   /** . */
    private AuthorizationDomainRegistry authorizationDomainRegistry;
 
-   /**
-    * .
-    */
+   /** . */
    private PortalAuthorizationManagerFactory portalAuthorizationManagerFactory;
 
-   /**
-    * .
-    */
+   /** . */
    private AbstractAuthorizationBean auth = new PortalObjectAuthorizationBean();
 
-   /**
-    * .
-    */
+   /** . */
    private ThemeBean themes = new ThemeBean();
 
-   /**
-    * Compares two windows according to their order.
-    */
+   /** Compares two windows according to their order. */
    private static final Comparator comparator = new Comparator()
    {
       public int compare(Object o1, Object o2)
@@ -285,8 +256,8 @@
 
 
    /**
-    * bind the theme service.
-    * (defined in the faces-config.xml; injected in WebAppEnhancer, based on jboss-portlet.xml service entry)
+    * bind the theme service. (defined in the faces-config.xml; injected in WebAppEnhancer, based on jboss-portlet.xml
+    * service entry)
     *
     * @param themeService
     */
@@ -364,9 +335,7 @@
       selectedPlugin = (String)pmap.get("plugin");
    }
 
-   /**
-    * Proceed to an object selection.
-    */
+   /** Proceed to an object selection. */
    public void selectObject()
    {
       try
@@ -411,9 +380,7 @@
       }
    }
 
-   /**
-    * Proceed to object destroy.
-    */
+   /** Proceed to object destroy. */
    public void destroyObject()
    {
       try
@@ -700,9 +667,7 @@
       }
    }
 
-   /**
-    * Returns a <Region,<Window>SortedSet>Map.
-    */
+   /** Returns a <Region,<Window>SortedSet>Map. */
    private Map getWindows(Page page) throws Exception
    {
       // Get the layout
@@ -736,9 +701,7 @@
       return windows;
    }
 
-   /**
-    * Return the <Region>List on the selected object which must be a page.
-    */
+   /** Return the <Region>List on the selected object which must be a page. */
    public List getCols() throws Exception
    {
       Map windows = getWindows((Page)getSelectedObject());
@@ -751,9 +714,7 @@
       return regions;
    }
 
-   /**
-    * Return an array of <Region,Window>Map on the selected object which must be a page.
-    */
+   /** Return an array of <Region,Window>Map on the selected object which must be a page. */
    public Map[] getRows() throws Exception
    {
       Map windows = getWindows((Page)getSelectedObject());
@@ -802,8 +763,8 @@
    // ***
 
    /**
-    * NOTE: This is just to show an alternative way of supplying tree data.  You can supply either a
-    * TreeModel or TreeNode.
+    * NOTE: This is just to show an alternative way of supplying tree data.  You can supply either a TreeModel or
+    * TreeNode.
     *
     * @return TreeModel
     */

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PortletManagerBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,61 +1,62 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
 import org.jboss.logging.Logger;
-import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.value.Value;
 import org.jboss.portal.core.model.instance.InstanceContainer;
 import org.jboss.portal.faces.matrix.Cell;
 import org.jboss.portal.faces.matrix.Row;
 import org.jboss.portal.faces.matrix.RowSetModel;
+import org.jboss.portal.federation.FederatedPortletInvoker;
+import org.jboss.portal.federation.FederatingPortletInvoker;
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.Role;
 import org.jboss.portal.identity.RoleModule;
 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.PortletContext;
+import org.jboss.portal.portlet.info.MetaInfo;
 import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.MetaInfo;
 import org.jboss.portal.security.AuthorizationDomainRegistry;
 import org.jboss.portal.security.SecurityConstants;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import org.jboss.portal.federation.FederatingPortletInvoker;
-import org.jboss.portal.federation.FederatedPortletInvoker;
 
 import javax.faces.context.FacesContext;
 import javax.faces.model.SelectItem;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.Locale;
-import java.util.Comparator;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -65,54 +66,34 @@
 public class PortletManagerBean
 {
 
-   /**
-    * .
-    */
+   /** . */
    private Logger log = Logger.getLogger(getClass());
 
-   /**
-    * .
-    */
+   /** . */
    private InstanceContainer instanceContainer;
 
-   /**
-    * .
-    */
+   /** . */
    private AuthorizationDomainRegistry authorizationDomainRegistry;
 
-   /**
-    * .
-    */
+   /** . */
    private String selectedPortletId;
 
-   /**
-    * The current tab name.
-    */
+   /** The current tab name. */
    private String selectedPlugin;
 
-   /**
-    * .
-    */
+   /** . */
    private RoleModule roleModule;
 
-   /**
-    * .
-    */
+   /** . */
    private PreferencesBean selectedPreferences;
 
-   /**
-    * .
-    */
+   /** . */
    private String selectedFederatedId;
 
-   /**
-    * .
-    */
+   /** . */
    private AbstractAuthorizationBean auth = new AuthorizationBean();
 
-   /**
-    * .
-    */
+   /** . */
    private FederatingPortletInvoker federatingPortletInvoker;
 
    private String sortColumn;
@@ -303,9 +284,7 @@
       return selectedPreferences;
    }
 
-   /**
-    * Refresh the selected prefs if they are available.
-    */
+   /** Refresh the selected prefs if they are available. */
    public void refresh()
    {
       selectedPreferences = null;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/PreferencesBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
-import org.jboss.portal.faces.matrix.RowSetModel;
 import org.jboss.portal.faces.matrix.Cell;
 import org.jboss.portal.faces.matrix.Row;
+import org.jboss.portal.faces.matrix.RowSetModel;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/Refresher.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management;
 
-import javax.faces.event.PhaseListener;
+import javax.faces.context.FacesContext;
 import javax.faces.event.PhaseEvent;
 import javax.faces.event.PhaseId;
-import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseListener;
 
 /**
  * Refresh the beans before JSR performs the render.

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddPageAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
 import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.PageContainer;
 import org.jboss.portal.core.model.portal.PortalObjectPermission;
 import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
-import org.jboss.portal.security.spi.provider.DomainConfigurator;
 import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.SecurityConstants;
+import org.jboss.portal.security.spi.provider.DomainConfigurator;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
+import java.util.Collections;
 import java.util.Set;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -85,17 +86,17 @@
     */
    public void validatePageName(FacesContext context, UIComponent toValidate, Object value)
    {
-      String pageName = (String) value;
+      String pageName = (String)value;
 
       // check for empty string
-      if(pageName.startsWith(" "))
+      if (pageName.startsWith(" "))
       {
          FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_EMPTY_NAME, ERROR_EMPTY_NAME);
          throw new ValidatorException(message);
       }
 
       // Check for duplicate child name
-      if(pomgr.getSelectedObject().getChild(pageName) != null)
+      if (pomgr.getSelectedObject().getChild(pageName) != null)
       {
          FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, ERROR_DUPE_NAME, ERROR_DUPE_NAME);
          throw new ValidatorException(message);
@@ -112,7 +113,7 @@
          Set constraints = Collections.singleton(new RoleSecurityBinding(PortalObjectPermission.VIEW_RECURSIVE_ACTION, SecurityConstants.UNCHECKED_ROLE_NAME));
          configurator.setSecurityBindings(page.getId(), constraints);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/AddWindowAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
 import org.jboss.portal.core.model.portal.Page;
 import org.jboss.portal.core.model.portal.Window;
 import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
 import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import org.jboss.portal.security.RoleSecurityBinding;
-import org.jboss.portal.security.SecurityConstants;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 import javax.faces.validator.ValidatorException;
-import java.util.Set;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -93,7 +89,7 @@
     */
    public void validateWindowName(FacesContext context, UIComponent toValidate, Object value)
    {
-      String windowName = (String) value;
+      String windowName = (String)value;
 
       // check for empty string
       if (windowName.startsWith(" "))
@@ -104,8 +100,8 @@
       }
 
       // check for duplicate window name
-      Page page = (Page) pomgr.getSelectedObject();
-      if(page.getWindow(windowName) != null)
+      Page page = (Page)pomgr.getSelectedObject();
+      if (page.getWindow(windowName) != null)
       {
          String error = "Duplicate window name found on this page!";
          FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, error, error);
@@ -119,15 +115,15 @@
       {
          FacesContext ctx = FacesContext.getCurrentInstance();
          ValueBinding vb = ctx.getApplication().createValueBinding("#{col}");
-         String region = (String) vb.getValue(ctx);
-         Page page = (Page) pomgr.getSelectedObject();
+         String region = (String)vb.getValue(ctx);
+         Page page = (Page)pomgr.getSelectedObject();
 
          Window window = page.createWindow(windowName);
          window.setInstanceRef(instanceId);
          window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, region);
          window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/CreateInstanceAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.model.instance.InstanceContainer;
+import org.jboss.portal.core.portlet.management.InstanceManagerBean;
 import org.jboss.portal.core.portlet.management.PortletManagerBean;
-import org.jboss.portal.core.portlet.management.InstanceManagerBean;
 import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.SecurityConstants;
-import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.spi.provider.DomainConfigurator;
 
+import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
-import javax.faces.application.FacesMessage;
+import java.util.Collections;
 import java.util.Set;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PortalAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
-import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
-import org.jboss.portal.core.model.portal.PortalObjectPermission;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.core.model.portal.Context;
+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.Page;
-import org.jboss.portal.security.spi.provider.DomainConfigurator;
+import org.jboss.portal.core.model.portal.PortalObjectPermission;
+import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
 import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.SecurityConstants;
+import org.jboss.portal.security.spi.provider.DomainConfigurator;
 import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
 import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
-import java.util.Set;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -50,26 +51,18 @@
 public class PortalAction
 {
 
-   /**
-    * .
-    */
+   /** . */
    private PortalObjectManagerBean pomgr;
 
-   /**
-    * .
-    */
+   /** . */
    private String portalName;
 
    //private String defaultPageName;
 
-   /**
-    * .
-    */
+   /** . */
    private static final String ERROR_DUPE_NAME = "Duplicate Portal name found on this portal!";
 
-   /**
-    * .
-    */
+   /** . */
    private static final String ERROR_EMPTY_NAME = "Portal name cannot be blank!";
 
    public PortalObjectManagerBean getPortalObjectManager()
@@ -103,7 +96,7 @@
       {
          pomgr.getSelectedObject().setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, defaultPageName);
       }
-      else if (defaultPageName == null  || defaultPageName.equals(""))
+      else if (defaultPageName == null || defaultPageName.equals(""))
       {
          pomgr.getSelectedObject().setDeclaredProperty(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, null);
       }
@@ -112,8 +105,8 @@
 
 
    /**
-    * Checks for duplicate portal names on the portal instance. Blank page names are not allowed and are controlled by the
-    * required attribute in the presentation page.
+    * Checks for duplicate portal names on the portal instance. Blank page names are not allowed and are controlled by
+    * the required attribute in the presentation page.
     *
     * @param context
     * @param toValidate

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PreferenceAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
-import org.jboss.portal.portlet.state.SimplePropertyMap;
 import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.common.value.Value;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.portlet.management.InstanceManagerBean;
 import org.jboss.portal.faces.matrix.AbstractCellAction;
@@ -33,6 +31,9 @@
 import org.jboss.portal.faces.matrix.Row;
 import org.jboss.portal.faces.matrix.RowSetModel;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.SimplePropertyMap;
 
 import java.util.ArrayList;
 import java.util.Arrays;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/PropertyAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,47 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
-import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
-import org.jboss.portal.core.portlet.management.InstanceManagerBean;
-import org.jboss.portal.core.model.portal.PortalObject;
-import org.jboss.portal.core.model.portal.Context;
-import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.security.spi.provider.DomainConfigurator;
-import org.jboss.portal.security.RoleSecurityBinding;
-import org.jboss.portal.security.SecurityConstants;
-import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.logging.Logger;
 import org.apache.myfaces.component.html.ext.HtmlDataTable;
+import org.jboss.logging.Logger;
+import org.jboss.portal.core.portlet.management.PortalObjectManagerBean;
 
-import javax.faces.context.FacesContext;
-import javax.faces.component.UIComponent;
 import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
 import javax.faces.validator.ValidatorException;
-import javax.faces.event.ActionEvent;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -51,9 +39,7 @@
 {
    private Logger log = Logger.getLogger(getClass());
 
-   /**
-    * .
-    */
+   /** . */
    private PortalObjectManagerBean pomgr;
 
    private HtmlDataTable propertyDataTable;
@@ -142,7 +128,7 @@
 
    public void updateProperty()
    {
-      if(!(getSelectedProperty() == null || getSelectedProperty().equals("") || getSelectedProperty().startsWith(" ")))
+      if (!(getSelectedProperty() == null || getSelectedProperty().equals("") || getSelectedProperty().startsWith(" ")))
       {
          getPortalObjectManager().getSelectedObject().setDeclaredProperty(getSelectedProperty(), getPropertyValue());
       }

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/management/actions/ThemePropertyAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.management.actions;
 
 import org.jboss.portal.core.model.portal.PortalObject;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/plugins/ContentRewritePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.plugins;
 
 import javax.portlet.GenericPortlet;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HeaderContentPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.plugins;
 
 import org.apache.log4j.Logger;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/plugins/HintPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.plugins;
 
 import javax.portlet.GenericPortlet;
@@ -37,17 +38,18 @@
 public class HintPortlet extends GenericPortlet
 {
    public void doView(RenderRequest req, RenderResponse res)
-           throws PortletException, IOException {
+      throws PortletException, IOException
+   {
 
       PortletPreferences prefs = req.getPreferences();
 
       res.setContentType("text/html");
       Writer writer = res.getWriter();
       writer.write("<div class=\"portlet-section-header\">");
-      writer.write(prefs.getValue("hint-title","Hint:"));
+      writer.write(prefs.getValue("hint-title", "Hint:"));
       writer.write("</div>");
       writer.write("<div class=\"portlet-section-body\">");
-      writer.write(prefs.getValue("hint-text","...please set the 'hint-text' preference!..."));
+      writer.write(prefs.getValue("hint-text", "...please set the 'hint-text' preference!..."));
       writer.write("</div>");
       writer.flush();
       writer.close();

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.role;
 
 import org.jboss.logging.Logger;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 import org.jboss.portal.core.portlet.PortletHelper;
 import org.jboss.portal.core.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.Role;
 import org.jboss.portal.identity.RoleModule;
@@ -62,9 +63,7 @@
 public class RolePortlet
    extends JBossPortlet
 {
-   /**
-    * the class logger
-    */
+   /** the class logger */
    public static final Logger log = Logger.getLogger(JBossPortlet.class);
 
    private PortletHelper portletHelper;
@@ -76,19 +75,13 @@
 
    public static final String OP_SHOWEDITROLE = "showEditRole";
 
-   /**
-    * Main Edit role page where admins can filter
-    */
+   /** Main Edit role page where admins can filter */
    public static final String OP_SHOWMAINROLEMEMBERS = "showMainEditRoleMembers";
 
-   /**
-    * Edit role page where admins can edit the members individually.
-    */
+   /** Edit role page where admins can edit the members individually. */
    public static final String OP_SHOWLISTROLEMEMBERS = "showListEditRoleMembers";
 
-   /**
-    * Render operation to show the screen to assign roles to a user
-    */
+   /** Render operation to show the screen to assign roles to a user */
    public static final String OP_SHOWADDROLESTOUSER = "showAddRolesToUser";
 
    private RoleModule roleModule;
@@ -699,9 +692,7 @@
       return true;
    }
 
-   /**
-    * Returns true if the role with name in argument is available
-    */
+   /** Returns true if the role with name in argument is available */
    private boolean roleByNameAvailable(String name)
    {
       Role role = null;
@@ -720,9 +711,7 @@
       return false;
    }
 
-   /**
-    * Return a localized sentence stating the number of existing roles
-    */
+   /** Return a localized sentence stating the number of existing roles */
    private String getNbRolesString(ResourceBundle bundle)
    {
       StringBuffer buffer = new StringBuffer();

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/BasicPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -70,7 +71,7 @@
       //
       writer.write("window state : " + request.getWindowState());
       writer.write("<table><th><td>name</td><td>value</td></th>");
-      for (Iterator i = request.getParameterMap().entrySet().iterator();i.hasNext();)
+      for (Iterator i = request.getParameterMap().entrySet().iterator(); i.hasNext();)
       {
          Map.Entry entry = (Map.Entry)i.next();
          String name = (String)entry.getKey();

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/CharsetPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,44 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
+import org.apache.log4j.Logger;
 import org.jboss.portal.format.util.EntityTable;
-import org.apache.log4j.Logger;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 
 /**
- * This portlet is used to display a form that helps to test the charset handling by the portal and
- * the client. When a fault occurs it may be the client fault (for instance the char with unicode
- * value 160 fail the test in firefox but succeds in IE6).
+ * This portlet is used to display a form that helps to test the charset handling by the portal and the client. When a
+ * fault occurs it may be the client fault (for instance the char with unicode value 160 fail the test in firefox but
+ * succeds in IE6).
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -66,7 +67,7 @@
 
       //
       StringBuffer buffer = new StringBuffer();
-      for (int i = from;i < to;i++)
+      for (int i = from; i < to; i++)
       {
          char c = (char)i;
          buffer.append(c);
@@ -142,21 +143,21 @@
       //
       writer.print(
          "<div> Testing range : " +
-         "<form action=\"" + resp.createRenderURL() + "\" method=\"post\"\">" +
-         "<input type=\"text\" name=\"from\" value=\"" + from + "\"/>" +
-         "<input type=\"text\" name=\"to\" value=\"" + to + "\"/>" +
-         "<input type=\"submit\" value=\"change\"/>" +
-         "</form>" +
-         "</div>");
+            "<form action=\"" + resp.createRenderURL() + "\" method=\"post\"\">" +
+            "<input type=\"text\" name=\"from\" value=\"" + from + "\"/>" +
+            "<input type=\"text\" name=\"to\" value=\"" + to + "\"/>" +
+            "<input type=\"submit\" value=\"change\"/>" +
+            "</form>" +
+            "</div>");
 
       //
       writer.println(
          "<div>" +
-         "<form action=\"" + resp.createActionURL() + "\" accept-charset=\"" + resp.getCharacterEncoding() + "\" method=\"post\">" +
-         "<input type=\"hidden\" name=\"from\" value=\"" + from + "\"/>" +
-         "<input type=\"hidden\" name=\"to\" value=\"" + to + "\"/>" +
-         "<textarea name=\"text\" cols=\"20\" rows=\"10\" wrap=\"virtual\">");
-      for (int i = from;i < to;i++)
+            "<form action=\"" + resp.createActionURL() + "\" accept-charset=\"" + resp.getCharacterEncoding() + "\" method=\"post\">" +
+            "<input type=\"hidden\" name=\"from\" value=\"" + from + "\"/>" +
+            "<input type=\"hidden\" name=\"to\" value=\"" + to + "\"/>" +
+            "<textarea name=\"text\" cols=\"20\" rows=\"10\" wrap=\"virtual\">");
+      for (int i = from; i < to; i++)
       {
          char c = (char)i;
          String s = EntityTable.FULL.lookup(c);
@@ -171,9 +172,9 @@
       }
       writer.println(
          "</textarea>" +
-         "<input type=\"submit\" value=\"check\"/>" +
-         "</form>" +
-         "</div>");
+            "<input type=\"submit\" value=\"check\"/>" +
+            "</form>" +
+            "</div>");
 
       //
       writer.close();

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/CounterPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.GenericPortlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;
 import javax.portlet.PortletSession;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/EncodingPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletSession;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -41,8 +41,8 @@
 
    public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException
    {
-      resp.setRenderParameter("text",req.getParameter("text"));
-      req.getPortletSession().setAttribute("text",req.getParameter("text"));
+      resp.setRenderParameter("text", req.getParameter("text"));
+      req.getPortletSession().setAttribute("text", req.getParameter("text"));
 
    }
 
@@ -54,25 +54,25 @@
       String param = req.getParameter("text");
       String attr = (String)req.getPortletSession().getAttribute("text");
 
-            //
+      //
       writer.print(
          "<div> Text to pass : " +
-         "<form action=\"" + resp.createRenderURL() + "\" method=\"post\"\" accept-charset=\"" + resp.getCharacterEncoding() + "\" >" +
-         "<input type=\"text\" name=\"text\" value=\"\"/>" +
-         "<input type=\"submit\" value=\"Submit to render phase\"/>" +
-         "</form>" +
-         "<form action=\"" + resp.createActionURL() + "\" method=\"post\"\" accept-charset=\"" + resp.getCharacterEncoding() + "\" >" +
-         "<input type=\"text\" name=\"text\" value=\"\"/>" +
-         "<input type=\"submit\" value=\"Submit to action phase\"/>" +
-         "</form>" +
-         "</div>");
+            "<form action=\"" + resp.createRenderURL() + "\" method=\"post\"\" accept-charset=\"" + resp.getCharacterEncoding() + "\" >" +
+            "<input type=\"text\" name=\"text\" value=\"\"/>" +
+            "<input type=\"submit\" value=\"Submit to render phase\"/>" +
+            "</form>" +
+            "<form action=\"" + resp.createActionURL() + "\" method=\"post\"\" accept-charset=\"" + resp.getCharacterEncoding() + "\" >" +
+            "<input type=\"text\" name=\"text\" value=\"\"/>" +
+            "<input type=\"submit\" value=\"Submit to action phase\"/>" +
+            "</form>" +
+            "</div>");
 
       //
       writer.println(
          "<div>" + "Text retrieved from request parameter: " +
-         "</div>" +
-         "<div>" +
-         "<textarea name=\"text\" cols=\"20\" rows=\"4\" wrap=\"virtual\">");
+            "</div>" +
+            "<div>" +
+            "<textarea name=\"text\" cols=\"20\" rows=\"4\" wrap=\"virtual\">");
 
       if (param != null)
       {
@@ -81,13 +81,13 @@
 
       writer.println(
          "</textarea>" +
-         "</div>");
+            "</div>");
 
       writer.println(
          "<div>" + "Text retrieved from portlet session (value set during Action Phase): " +
-         "</div>" +
-         "<div>" +
-         "<textarea name=\"text\" cols=\"20\" rows=\"4\" wrap=\"virtual\">");
+            "</div>" +
+            "<div>" +
+            "<textarea name=\"text\" cols=\"20\" rows=\"4\" wrap=\"virtual\">");
 
       if (attr != null)
       {
@@ -96,7 +96,7 @@
 
       writer.println(
          "</textarea>" +
-         "</div>");
+            "</div>");
 
       //
       writer.close();

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/ExceptionPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
 import org.jboss.portlet.JBossPortlet;
@@ -71,21 +72,21 @@
       writer.write("<div class=\"portlet-section-header\">Throw :</div>");
       writer.write("<div class=\"portlet-section-body\">");
       renderURL.setParameter("op", "portletexception");
-      writer.write("<div><a href=\"" + renderURL  + "\">render PortletException</a></div>");
+      writer.write("<div><a href=\"" + renderURL + "\">render PortletException</a></div>");
       renderURL.setParameter("op", "portletsecurityexception");
-      writer.write("<div><a href=\"" + renderURL  + "\">render PortletSecurityException</a></div>");
+      writer.write("<div><a href=\"" + renderURL + "\">render PortletSecurityException</a></div>");
       renderURL.setParameter("op", "ioexception");
-      writer.write("<div><a href=\"" + renderURL  + "\">render IOException</a></div>");
+      writer.write("<div><a href=\"" + renderURL + "\">render IOException</a></div>");
       renderURL.setParameter("op", "runtimeexception");
-      writer.write("<div><a href=\"" + renderURL  + "\">render RuntimeException</a></div>");
+      writer.write("<div><a href=\"" + renderURL + "\">render RuntimeException</a></div>");
       actionURL.setParameter("op", "portletexception");
-      writer.write("<div><a href=\"" + actionURL  + "\">action PortletException</a></div>");
+      writer.write("<div><a href=\"" + actionURL + "\">action PortletException</a></div>");
       actionURL.setParameter("op", "portletsecurityexception");
-      writer.write("<div><a href=\"" + actionURL  + "\">action PortletSecurityException</a></div>");
+      writer.write("<div><a href=\"" + actionURL + "\">action PortletSecurityException</a></div>");
       actionURL.setParameter("op", "ioexception");
-      writer.write("<div><a href=\"" + actionURL  + "\">action IOException</a></div>");
+      writer.write("<div><a href=\"" + actionURL + "\">action IOException</a></div>");
       actionURL.setParameter("op", "runtimeexception");
-      writer.write("<div><a href=\"" + actionURL  + "\">action RuntimeException</a></div>");
+      writer.write("<div><a href=\"" + actionURL + "\">action RuntimeException</a></div>");
       writer.write("</div>");
       writer.write("</p>");
    }

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/PortletSessionPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.GenericPortlet;
@@ -33,6 +30,9 @@
 import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -101,7 +101,7 @@
    {
       writer.println("<table>");
       writer.println("<tr><td>name</td><td>value</td>");
-      for (Enumeration e = session.getAttributeNames(scope);e.hasMoreElements();)
+      for (Enumeration e = session.getAttributeNames(scope); e.hasMoreElements();)
       {
          String name = (String)e.nextElement();
          Object value = session.getAttribute(name, scope);

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/TestPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.portlet.PortalContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
-import javax.portlet.PortletRequest;
-import javax.transaction.Transaction;
-
+import org.jboss.portal.common.transaction.TransactionManagerProvider;
 import org.jboss.portal.core.CoreConstants;
-import org.jboss.portal.common.transaction.TransactionManagerProvider;
 import org.jboss.portal.identity.User;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
@@ -45,6 +31,20 @@
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.portlet.JBossRenderResponse;
 
+import javax.portlet.PortalContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletURL;
+import javax.transaction.Transaction;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -67,7 +67,7 @@
       }
       roles.add(role);
    }
-   
+
    public void testaction(JBossActionRequest req, JBossActionResponse resp)
    {
       resp.setRenderParameter("name", "value");
@@ -116,19 +116,19 @@
       PortletURL roleURL = resp.createActionURL();
       roleURL.setParameter("op", "addrole");
       writer.write("<div>" +
-                   "<form action=\""+ roleURL + "\" method=\"post\">" +
-                   "<input class=\"portlet-form-input-field\" type=\"text\" name=\"role\" value=\"\"/>" +
-                   "<input class=\"portlet-form-button\" type=\"submit\" value=\"add role\"/>" +
-                   "</form>" +
-                   "</div>");
+         "<form action=\"" + roleURL + "\" method=\"post\">" +
+         "<input class=\"portlet-form-input-field\" type=\"text\" name=\"role\" value=\"\"/>" +
+         "<input class=\"portlet-form-button\" type=\"submit\" value=\"add role\"/>" +
+         "</form>" +
+         "</div>");
       writer.write("</p>");
 
       //
       writer.write("<p>");
       writer.write("<div class=\"portlet-section-header\">Capabilities</div>");
       writer.write("<div class=\"portlet-section-body\">");
-      writer.write("<div>Content type " + req.getResponseContentType()  + "</div>");
-      writer.write("<div>Preferred markup " + req.getProperty(CoreConstants.REQ_PROP_PREFERRED_MARKUP)  + "</div>");
+      writer.write("<div>Content type " + req.getResponseContentType() + "</div>");
+      writer.write("<div>Preferred markup " + req.getProperty(CoreConstants.REQ_PROP_PREFERRED_MARKUP) + "</div>");
       writer.write("</div>");
       writer.write("</p>");
 
@@ -160,11 +160,11 @@
       writer.write("<div class=\"portlet-section-body\">");
       PortalContext portalCtx = req.getPortalContext();
       writer.write("<div>version : " + portalCtx.getPortalInfo() + "</div>");
-      for (Enumeration e = portalCtx.getPropertyNames();e.hasMoreElements();)
+      for (Enumeration e = portalCtx.getPropertyNames(); e.hasMoreElements();)
       {
          String propertyName = (String)e.nextElement();
          String propertyValue = portalCtx.getProperty(propertyName);
-         writer.write("<div>" + propertyName + " : " + propertyValue  + "</div>");
+         writer.write("<div>" + propertyName + " : " + propertyValue + "</div>");
       }
       writer.write("</div>");
       writer.write("</p>");
@@ -173,11 +173,11 @@
       writer.write("<p>");
       writer.write("<div class=\"portlet-section-header\">Request attributes</div>");
       writer.write("<div class=\"portlet-section-body\">");
-      for (Enumeration e = req.getAttributeNames();e.hasMoreElements();)
+      for (Enumeration e = req.getAttributeNames(); e.hasMoreElements();)
       {
          String name = (String)e.nextElement();
          Object value = req.getAttribute(name);
-         writer.write("<div>" + name + " : " + value  + "</div>");
+         writer.write("<div>" + name + " : " + value + "</div>");
       }
       writer.write("</div>");
       writer.write("</p>");
@@ -194,7 +194,7 @@
             Map.Entry entry = (Map.Entry)i.next();
             String key = (String)entry.getKey();
             String value = (String)entry.getValue();
-            writer.write("<div>" + key + " : " + value  + "</div>");
+            writer.write("<div>" + key + " : " + value + "</div>");
          }
       }
       writer.write("</div>");

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/URLPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test;
 
+import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
 import javax.portlet.PortletURL;
-import javax.portlet.PortletException;
-import javax.portlet.ActionRequest;
+import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.GenericPortlet;
+import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.IOException;
 import java.util.Enumeration;
 
 /**
@@ -40,7 +41,7 @@
 {
    public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
    {
-      for (Enumeration e = req.getParameterNames();e.hasMoreElements();)
+      for (Enumeration e = req.getParameterNames(); e.hasMoreElements();)
       {
          String name = (String)e.nextElement();
          String value = req.getParameter(name);
@@ -93,7 +94,7 @@
       writer.print("Parameters :<br/>");
       writer.print("<table bgcolor=\"" + color + "\">");
       writer.print("<tr><td>Name</td><td>value</td></tr>");
-      for (Enumeration e = req.getParameterNames();e.hasMoreElements();)
+      for (Enumeration e = req.getParameterNames(); e.hasMoreElements();)
       {
          String name = (String)e.nextElement();
          String value = req.getParameter(name);
@@ -110,7 +111,7 @@
 */
 
       //
-       writer.print("<a href=\"" + req.getContextPath() + "/test.txt\">test</a>");
+      writer.print("<a href=\"" + req.getContextPath() + "/test.txt\">test</a>");
 
       writer.close();
    }

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletA.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test.event;
 
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.PortletURL;
 import java.io.IOException;
 import java.io.PrintWriter;
 

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.test.event;
 
+import org.jboss.portal.WindowState;
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.event.PortalNodeEvent;
+import org.jboss.portal.api.node.event.PortalNodeEventContext;
 import org.jboss.portal.api.node.event.PortalNodeEventListener;
-import org.jboss.portal.api.node.event.PortalNodeEventContext;
 import org.jboss.portal.api.node.event.WindowActionEvent;
-import org.jboss.portal.api.node.PortalNode;
-import org.jboss.portal.WindowState;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletSecurityException;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeManagerPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.theme;
 
 import org.apache.log4j.Logger;
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.common.MediaType;
 import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
 import org.jboss.portal.core.model.portal.PortalObject;
@@ -34,7 +36,6 @@
 import org.jboss.portal.theme.ThemeService;
 import org.jboss.portal.theme.render.PortalRenderSet;
 import org.jboss.portal.theme.strategy.LayoutStrategy;
-import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.JBossPortlet;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/theme/ThemeSelectorPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.theme;
 
 import org.apache.log4j.Logger;
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.common.MediaType;
 import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
 import org.jboss.portal.core.model.portal.PortalObject;
@@ -35,7 +37,6 @@
 import org.jboss.portlet.JBossPortlet;
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.portal.api.node.PortalNode;
 
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/theme/WsrpSelectorTestPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.theme;
 
 import org.jboss.portal.common.MediaType;

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.user;
 
 import org.jboss.logging.Logger;
 import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.PortalNodeURL;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 import org.jboss.portal.common.util.LocaleInfo;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.URLTools;
@@ -32,6 +32,7 @@
 import org.jboss.portal.core.modules.MailModule;
 import org.jboss.portal.core.portlet.PortletHelper;
 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.Role;
 import org.jboss.portal.identity.RoleModule;
@@ -72,54 +73,34 @@
    extends JBossPortlet
 {
 
-   /**
-    * The class logger.
-    */
+   /** The class logger. */
    public static final Logger log = Logger.getLogger(JBossPortlet.class);
 
-   /**
-    * Render operation to show the login screen.
-    */
+   /** Render operation to show the login screen. */
    public static final String OP_SHOWLOGIN = "showLogin";
 
-   /**
-    * Render operation to show the register screen.
-    */
+   /** Render operation to show the register screen. */
    public static final String OP_SHOWREGISTER = "showRegister";
 
-   /**
-    * Render operation to show the register thankyou screen.
-    */
+   /** Render operation to show the register thankyou screen. */
    public static final String OP_SHOWREGISTER_TY = "showRegisterty";
 
-   /**
-    * Render operation to show the user menu screen.
-    */
+   /** Render operation to show the user menu screen. */
    public static final String OP_SHOWMENU = "showMenu";
 
-   /**
-    * Render operation to show the user profile to edit.
-    */
+   /** Render operation to show the user profile to edit. */
    public static final String OP_SHOWPROFILE = "showProfile";
 
-   /**
-    * Render operation to show the screen to assign roles to a user.
-    */
+   /** Render operation to show the screen to assign roles to a user. */
    public static final String OP_SHOWADDROLESTOUSER = "showAddRolesToUser";
 
-   /**
-    * Render operation to show the list of users.
-    */
+   /** Render operation to show the list of users. */
    public static final String OP_SHOWLISTUSERS = "showListUsers";
 
-   /**
-    * Logout the user.
-    */
+   /** Logout the user. */
    public static final String OP_USERLOGOUT = "userLogout";
 
-   /**
-    * Deletes the user
-    */
+   /** Deletes the user */
    public static final String OP_DELETEUSER = "deleteUser";
 
    private UserModule userModule;
@@ -572,9 +553,7 @@
    }
 
 
-   /**
-    * Performs a log out.
-    */
+   /** Performs a log out. */
    public void userLogout(JBossActionRequest req, JBossActionResponse resp) throws IOException
    {
       String locationURL = req.getParameter("locationURL");

Modified: trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/user/UserPortletConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.portlet.user;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class UserPortletConstants
 {
-   
+
    public static final String SALT = "14m1r0nm4n";
-   
+
    public static final String INFOMESSAGE = "infomessage";
    public static final String ERRORMESSAGE = "errormessage";
-   
+
    // Cookie names
    public static String CK_USERNAME = "username";
    public static String CK_PASS = "password";
-   
+
    // Default values
    public static int DEFAULT_USERSPERPAGE = 10;
-   
+
    // Status return codes for the login.
    public static final int LOGIN_STATUS_OK = 0;
    public static final int LOGIN_STATUS_BAD_PASSWORD = 1;
@@ -55,69 +53,67 @@
    public static final String USERID = "userid";
 
    // Portlet configuration
-   
+
    public static final String EMAILFROM = "emailFrom";
    public static final String SUBSCRIPTIONMODE = "subscriptionMode";
    public static final String SUBSCRIPTIONMODE_AUTOMATIC = "automatic";
    public static final String SUBSCRIPTIONMODE_EMAILVERIFICATION = "emailVerification";
    public static final String DEFAULT_ROLE = "defaultRole";
-   
-   /**
-    * Timezone information : ((value + 1) * 2) - 1 = 2 * value + 1
-    */
+
+   /** Timezone information : ((value + 1) * 2) - 1 = 2 * value + 1 */
    public static final String[] TIME_ZONE_OFFSETS =
-           {
-               "(GMT -12:00 hours) Eniwetok, Kwajalein",
-               null,
-               "(GMT -11:00 hours) Midway Island, Samoa",
-               null,
-               "(GMT -10:00 hours) Hawaii",
-               null,
-               "(GMT -9:00 hours) Alaska",
-               null,
-               "(GMT -8:00 hours) Pacific Time (US & Canada)",
-               null,
-               "(GMT -7:00 hours) Mountain Time (US & Canada)",
-               null,
-               "(GMT -6:00 hours) Central Time (US & Canada), Mexico City",
-               null,
-               "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito",
-               null,
-               "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz",
-               "(GMT -3:30 hours) Newfoundland",
-               "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown",
-               null,
-               "(GMT -2:00 hours) Mid-Atlantic",
-               null,
-               "(GMT -1:00 hours) Azores, Cape Verde Islands",
-               null,
-               "(GMT) Western Europe Time, London, Lisbon, Casablanca, Monrovia",
-               null,
-               "(GMT +1:00 hours) CET(Central Europe Time), Brussels, Copenhagen, Madrid, Paris",
-               null,
-               "(GMT +2:00 hours) EET(Eastern Europe Time), Kaliningrad, South Africa",
-               null,
-               "(GMT +3:00 hours) Baghdad, Kuwait, Riyadh, Moscow, St. Petersburg",
-               "(GMT +3:30 hours) Tehran",
-               "(GMT +4:00 hours) Abu Dhabi, Muscat, Baku, Tbilisi",
-               "(GMT +4:30 hours) Kabul",
-               "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent",
-               "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi",
-               "(GMT +6:00 hours) Almaty, Dhaka, Colombo",
-               null,
-               "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta",
-               null,
-               "(GMT +8:00 hours) Beijing, Perth, Singapore, Hong Kong, Chongqing, Urumqi, Taipei",
-               null,
-               "(GMT +9:00 hours) Tokyo, Seoul, Osaka, Sapporo, Yakutsk",
-               "(GMT +9:30 hours) Adelaide, Darwin",
-               "(GMT +10:00 hours) EAST(East Australian Standard)",
-               null,
-               "(GMT +11:00 hours) Magadan, Solomon Islands, New Caledonia",
-               null,
-               "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island",
-               null
-           };
+      {
+         "(GMT -12:00 hours) Eniwetok, Kwajalein",
+         null,
+         "(GMT -11:00 hours) Midway Island, Samoa",
+         null,
+         "(GMT -10:00 hours) Hawaii",
+         null,
+         "(GMT -9:00 hours) Alaska",
+         null,
+         "(GMT -8:00 hours) Pacific Time (US & Canada)",
+         null,
+         "(GMT -7:00 hours) Mountain Time (US & Canada)",
+         null,
+         "(GMT -6:00 hours) Central Time (US & Canada), Mexico City",
+         null,
+         "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito",
+         null,
+         "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz",
+         "(GMT -3:30 hours) Newfoundland",
+         "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown",
+         null,
+         "(GMT -2:00 hours) Mid-Atlantic",
+         null,
+         "(GMT -1:00 hours) Azores, Cape Verde Islands",
+         null,
+         "(GMT) Western Europe Time, London, Lisbon, Casablanca, Monrovia",
+         null,
+         "(GMT +1:00 hours) CET(Central Europe Time), Brussels, Copenhagen, Madrid, Paris",
+         null,
+         "(GMT +2:00 hours) EET(Eastern Europe Time), Kaliningrad, South Africa",
+         null,
+         "(GMT +3:00 hours) Baghdad, Kuwait, Riyadh, Moscow, St. Petersburg",
+         "(GMT +3:30 hours) Tehran",
+         "(GMT +4:00 hours) Abu Dhabi, Muscat, Baku, Tbilisi",
+         "(GMT +4:30 hours) Kabul",
+         "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent",
+         "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi",
+         "(GMT +6:00 hours) Almaty, Dhaka, Colombo",
+         null,
+         "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta",
+         null,
+         "(GMT +8:00 hours) Beijing, Perth, Singapore, Hong Kong, Chongqing, Urumqi, Taipei",
+         null,
+         "(GMT +9:00 hours) Tokyo, Seoul, Osaka, Sapporo, Yakutsk",
+         "(GMT +9:30 hours) Adelaide, Darwin",
+         "(GMT +10:00 hours) EAST(East Australian Standard)",
+         null,
+         "(GMT +11:00 hours) Magadan, Solomon Islands, New Caledonia",
+         null,
+         "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island",
+         null
+      };
 
    public static final String DEFAULT_IMAGES_PATH = "images/user";
 }

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp;
 
-import java.io.IOException;
-import java.util.LinkedList;
+import org.jboss.logging.Logger;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
 
 import javax.portlet.PortletRequest;
 import javax.servlet.ServletConfig;
@@ -32,57 +34,45 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.HttpJspPage;
+import java.io.IOException;
+import java.util.LinkedList;
 
-import org.jboss.logging.Logger;
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
-
 /**
- * Any JSP page using the JBoss library should extend that class. It is done by
- * adding the following line at the top of the JSP <%@ page language="java"
- * extends="org.jboss.portal.core.servlet.jsp.JBossJsp" %>
- * 
+ * Any JSP page using the JBoss library should extend that class. It is done by adding the following line at the top of
+ * the JSP <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.JBossJsp" %>
+ *
  * @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$
  */
 public abstract class PortalJsp
-      implements HttpJspPage
+   implements HttpJspPage
 {
 
-   /**
-    * Key for context attribute in the portlet request.
-    */
+   /** Key for context attribute in the portlet request. */
    public static final String CTX_REQUEST = "org.jboss.portal.core.context";
 
-   /**
-    * HttpServletRequest so that it can be accessed in expression language
-    * static methods
-    */
+   /** HttpServletRequest so that it can be accessed in expression language static methods */
    public static final ThreadLocal request = new ThreadLocal();
 
-   /**
-    * Stack of context, needed by expression language static methods
-    */
+   /** Stack of context, needed by expression language static methods */
    public static final ThreadLocal contextStack = new ThreadLocal();
 
-   /**
-    * To log JSP related information
-    */
+   /** To log JSP related information */
    public static Logger log = Logger.getLogger(PortalJsp.class);
 
    private ServletConfig config;
 
    /**
     * 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;
+      IOException;
 
    /**
     * HttpJspPage implementation
-    * 
+    *
     * @see javax.servlet.jsp.JspPage#jspInit()
     */
    public void jspInit()
@@ -91,7 +81,7 @@
 
    /**
     * HttpJspPage implementation
-    * 
+    *
     * @see javax.servlet.jsp.JspPage#jspDestroy()
     */
    public void jspDestroy()
@@ -100,7 +90,7 @@
 
    /**
     * HttpJspPage implementation
-    * 
+    *
     * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig)
     */
    public void init(ServletConfig config) throws ServletException
@@ -111,7 +101,7 @@
 
    /**
     * HttpJspPage implementation
-    * 
+    *
     * @see javax.servlet.Servlet#getServletConfig()
     */
    public ServletConfig getServletConfig()
@@ -121,28 +111,27 @@
 
    /**
     * HttpJspPage implementation
-    * 
-    * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest,
-    *      javax.servlet.ServletResponse)
+    *
+    * @see javax.servlet.Servlet#service(javax.servlet.ServletRequest,javax.servlet.ServletResponse)
     */
    public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException
    {
       // Get HttpServlet* from Servlet*
-      HttpServletRequest httpRequest = (HttpServletRequest) request;
-      HttpServletResponse httpResponse = (HttpServletResponse) response;
+      HttpServletRequest httpRequest = (HttpServletRequest)request;
+      HttpServletResponse httpResponse = (HttpServletResponse)response;
 
       // Keep the request and contextStack
       Object formerRequest = PortalJsp.request.get();
       Object formerContextStack = PortalJsp.contextStack.get();
 
       // Initialize the ThreadLocal for contextMap
-      PortletRequest req = (PortletRequest) request.getAttribute("javax.portlet.request");
+      PortletRequest req = (PortletRequest)request.getAttribute("javax.portlet.request");
       Object obj = req.getAttribute(CTX_REQUEST);
 
       LinkedList stack = new LinkedList();
       if (obj != null)
       {
-         Context ctx = (Context) obj;
+         Context ctx = (Context)obj;
          NamedContext namedCtx = new NamedContext("", ctx);
          stack.addLast(namedCtx);
       }
@@ -162,7 +151,7 @@
 
    /**
     * HttpJspPage implementation
-    * 
+    *
     * @see javax.servlet.Servlet#getServletInfo()
     */
    public String getServletInfo()
@@ -172,7 +161,7 @@
 
    /**
     * HttpJspPage implementation
-    * 
+    *
     * @see javax.servlet.Servlet#destroy()
     */
    public void destroy()

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,77 +1,79 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+
+import javax.portlet.PortletConfig;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import javax.portlet.PortletConfig;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Error tag. Used to include an error message.
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class ErrorTag
-      extends TagSupport
+   extends TagSupport
 {
 
    /** The serialVersionUID */
    private static final long serialVersionUID = 5521318012046201299L;
-   /**
-    * key attribute to the tag
-    */
+   /** key attribute to the tag */
    private String key;
-   
-   
+
+
    /**
     * Set the key attribute.
+    *
     * @param key
     */
    public void setKey(String key)
    {
       this.key = key;
    }
-   
+
    public int doStartTag() throws JspException
    {
       String value = pageContext.getRequest().getParameter(key);
-      if (value != null) {
-         
+      if (value != null)
+      {
+
          Locale locale = pageContext.getRequest().getLocale();
          PortletConfig portletConfig = (PortletConfig)pageContext.getRequest().getAttribute("javax.portlet.config");
          ResourceBundle resourceBundle = portletConfig.getResourceBundle(locale);
          String translatedValue = "";
          try
-         { 
+         {
             translatedValue = resourceBundle.getString(value);
-         } catch (MissingResourceException e) {
+         }
+         catch (MissingResourceException e)
+         {
             PortalJsp.log.error("No such resource key in resource file: " + key);
          }
 
@@ -79,14 +81,14 @@
          {
             Writer writer = pageContext.getOut();
             writer.write("<span class=\"portlet-msg-error\">" + translatedValue + "</span>");
-          }
+         }
          catch (IOException e)
          {
             // TODO Auto-generated catch block
             e.printStackTrace();
          }
       }
-      return SKIP_BODY; 
+      return SKIP_BODY;
    }
 
 }

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/ErrorsTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+
+import javax.portlet.PortletConfig;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Enumeration;
@@ -28,19 +34,13 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import javax.portlet.PortletConfig;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Errors tag. Used to include error messages.
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class ErrorsTag
-      extends TagSupport
+   extends TagSupport
 {
 
    /** The serialVersionUID */
@@ -58,9 +58,9 @@
             print(writer, pageContext.getRequest().getParameter(name));
          }
       }
-      return SKIP_BODY; 
+      return SKIP_BODY;
    }
-   
+
    private void print(Writer writer, String key)
    {
       Locale locale = pageContext.getRequest().getLocale();
@@ -68,15 +68,17 @@
       ResourceBundle resourceBundle = portletConfig.getResourceBundle(locale);
       String translatedValue = key;
       try
-      { 
+      {
          translatedValue = resourceBundle.getString(key);
-      } catch (MissingResourceException e) {
+      }
+      catch (MissingResourceException e)
+      {
          PortalJsp.log.error("No such resource key in resource file: " + key);
       }
       try
       {
          writer.write("<span class=\"portlet-msg-error\">" + translatedValue + "</span><br/>\n");
-       }
+      }
       catch (IOException e)
       {
          // TODO Auto-generated catch block

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IfTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,100 +1,100 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
-import java.util.Iterator;
-import java.util.LinkedList;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.Iterator;
+import java.util.LinkedList;
 
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Include a piece of code or not according to a condition
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class IfTag
-      extends TagSupport
+   extends TagSupport
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -7906376517169142721L;
 
-   /**
-    * Context of the section
-    */
+   /** Context of the section */
    private String ctx;
 
    private Iterator children;
-   
+
    private LinkedList contextStack;
-   
+
    private boolean include = false;
-   
-   /**
-    * @param ctx The ctx to set.
-    */
+
+   /** @param ctx The ctx to set. */
    public void setCtx(String ctx)
    {
       this.ctx = ctx;
    }
 
-   
+
    public int doStartTag() throws JspException
    {
       contextStack = (LinkedList)PortalJsp.contextStack.get();
-      
+
       // If no context has been set
-      if (contextStack.isEmpty()) {
+      if (contextStack.isEmpty())
+      {
          include = false;
          PortalJsp.log.debug("No context has been found");
          return SKIP_BODY;
       }
-      
+
       Context currentContext = ((NamedContext)contextStack.getLast()).getContext();
       children = currentContext.childIterator(ctx);
-      
+
       if (children.hasNext())
       {
          include = true;
          contextStack.addLast(new NamedContext(ctx, (Context)children.next()));
          return EVAL_PAGE;
-      } else {
+      }
+      else
+      {
          include = false;
          return SKIP_BODY;
-      }      
-   }   
-   
-   public int doEndTag() {
-      if (include) {
+      }
+   }
+
+   public int doEndTag()
+   {
+      if (include)
+      {
          contextStack.removeLast();
       }
       return SKIP_BODY;
    }
 
-   
    /*
    private String isTrue;
    private String isFalse;

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IncludeTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,98 +1,101 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
-import java.util.LinkedList;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.LinkedList;
 
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Inclusion tag. Used to include a JSP page to another page.
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class IncludeTag
-      extends TagSupport
+   extends TagSupport
 {
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -6033201557205419883L;
 
-   /**
-    * page attribute to the tag
-    */
+   /** page attribute to the tag */
    private String page;
-   
-   /**
-    * Stack of context before changing it for the inclusion
-    */
+
+   /** Stack of context before changing it for the inclusion */
    private LinkedList formerContextStack;
-   
+
    private Context formerContext;
-   
+
    /**
-    * Set the page attribute.
-    * THe filename can be relative or absolute (if starts with a /)
+    * Set the page attribute. THe filename can be relative or absolute (if starts with a /)
+    *
     * @param filename
     */
-   public void setPage(String filename) {
+   public void setPage(String filename)
+   {
       this.page = filename;
    }
-   
-   public int doStartTag() throws JspException {
-      
+
+   public int doStartTag() throws JspException
+   {
+
       // Save the former context stack
       formerContextStack = (LinkedList)PortalJsp.contextStack.get();
       formerContext = (Context)pageContext.getRequest().getAttribute(PortalJsp.CTX_REQUEST);
 
       LinkedList list = (LinkedList)PortalJsp.contextStack.get();
       LinkedList stack = new LinkedList();
-      if (!list.isEmpty()) {
+      if (!list.isEmpty())
+      {
          // Change the context attribute to the new context
-         NamedContext ctx =  (NamedContext)(list).getLast();
+         NamedContext ctx = (NamedContext)(list).getLast();
          pageContext.getRequest().setAttribute(PortalJsp.CTX_REQUEST, ctx.getContext());
 
          // Change the context stack to the new context
          stack.addLast(new NamedContext("", ctx.getContext()));
       }
-      
+
       // Include the JSP page
       try
       {
          pageContext.include(page);
          PortalJsp.contextStack.set(stack);
-      } catch (Exception e) {
+      }
+      catch (Exception e)
+      {
          PortalJsp.log.error("Cannot include page: " + page, e);
-      } finally {
+      }
+      finally
+      {
          // Put back to the original state
          PortalJsp.contextStack.set(formerContextStack);
          pageContext.getRequest().setAttribute(PortalJsp.CTX_REQUEST, formerContext);
       }
-      return SKIP_BODY; 
+      return SKIP_BODY;
    }
 
 }

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/IterateTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,68 +1,65 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
-import java.util.Iterator;
-import java.util.LinkedList;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.Iterator;
+import java.util.LinkedList;
 
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Iterate tag to define section that can be iterated on
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class IterateTag
-      extends TagSupport
+   extends TagSupport
 {
    /** The serialVersionUID */
    private static final long serialVersionUID = -4397890001761640952L;
 
-   /**
-    * Context of the section
-    */
+   /** Context of the section */
    private String ctx;
 
    private Iterator children;
-   
+
    private LinkedList contextStack;
-   
+
    private boolean include;
-   
-   /**
-    * @param ctx The context to set.
-    */
+
+   /** @param ctx The context to set. */
    public void setCtx(String ctx)
    {
       this.ctx = ctx;
    }
 
-   
-   public int doStartTag() throws JspException {
+
+   public int doStartTag() throws JspException
+   {
       contextStack = (LinkedList)PortalJsp.contextStack.get();
       if (contextStack.isEmpty())
       {
@@ -70,34 +67,43 @@
          PortalJsp.log.debug("No context has been found");
          return SKIP_BODY;
       }
-      
+
       Context currentContext = ((NamedContext)contextStack.getLast()).getContext();
       children = currentContext.childIterator(ctx);
-      
-      if (children.hasNext()) {
+
+      if (children.hasNext())
+      {
          include = true;
          contextStack.addLast(new NamedContext(ctx, (Context)children.next()));
          return EVAL_PAGE;
-      } else {
+      }
+      else
+      {
          include = false;
          return SKIP_BODY;
-      }      
-   }   
-   
-   public int doAfterBody() {
-      if (children.hasNext()) {
+      }
+   }
+
+   public int doAfterBody()
+   {
+      if (children.hasNext())
+      {
          Context context = (Context)children.next();
          contextStack.removeLast();
          contextStack.addLast(new NamedContext(ctx, context));
          return EVAL_BODY_AGAIN;
-      } else {
+      }
+      else
+      {
          return SKIP_BODY;
       }
    }
-   
-   public int doEndTag() {
-      if (include) {
-       contextStack.removeLast();
+
+   public int doEndTag()
+   {
+      if (include)
+      {
+         contextStack.removeLast();
       }
       return SKIP_BODY;
    }

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/PortalLib.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,49 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
+
+import javax.portlet.PortletConfig;
+import javax.servlet.http.HttpServletRequest;
 import java.util.LinkedList;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import javax.portlet.PortletConfig;
-import javax.servlet.http.HttpServletRequest;
-
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Expression language static functions for the JBoss library.
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class PortalLib
 {
-   
+
    /**
     * Internationalize messages
+    *
     * @param key Key of the message
     * @return The corresponding value in Resource.
     */
@@ -52,30 +53,34 @@
       HttpServletRequest request = (HttpServletRequest)(threadRequest.get());
       Locale locale = request.getLocale();
       PortletConfig portletConfig = (PortletConfig)request.getAttribute("javax.portlet.config");
-      ResourceBundle resourceBundle = portletConfig.getResourceBundle(locale); 
+      ResourceBundle resourceBundle = portletConfig.getResourceBundle(locale);
       PortalJsp.log.debug("Use locale:" + locale);
       try
-      { 
+      {
          return resourceBundle.getString(key);
-      } catch (MissingResourceException e) {
+      }
+      catch (MissingResourceException e)
+      {
          PortalJsp.log.error("No such resource key in resource file: " + key);
          return key;
       }
    }
-   
-  /**
-   * Return a translated message for a context value
-   * @param key The context value
-   * @return Translated text
-   */
+
+   /**
+    * Return a translated message for a context value
+    *
+    * @param key The context value
+    * @return Translated text
+    */
    public static String i18nOut(String key)
    {
       return getMessage(out(key));
    }
 
-   
+
    /**
     * Print a value from the context
+    *
     * @param key The context path to the value requested
     * @return The value defined in the context
     */
@@ -83,36 +88,45 @@
    {
       ThreadLocal contextStackLocal = PortalJsp.contextStack;
       LinkedList contextStack = (LinkedList)contextStackLocal.get();
-      
-      if (contextStack.isEmpty()) {
+
+      if (contextStack.isEmpty())
+      {
          PortalJsp.log.warn("No context has been defined when trying to access " + key);
          return "";
       }
 
       // Split by the dot
       String[] ctxNames = key.split("[.]");
-      
+
       NamedContext tmp = null;
-      int i=0;
-      
+      int i = 0;
+
       // Check that the path is correct
-      for (i=0; i < ctxNames.length - 1; i++) {
-         try {
-            tmp = (NamedContext)contextStack.get(i+1);
-         } catch (IndexOutOfBoundsException e) {
+      for (i = 0; i < ctxNames.length - 1; i++)
+      {
+         try
+         {
+            tmp = (NamedContext)contextStack.get(i + 1);
+         }
+         catch (IndexOutOfBoundsException e)
+         {
             PortalJsp.log.warn("The key you called: " + key + " is not valid, please check the key");
             return "";
          }
-         if (!ctxNames[i].equals(tmp.getName())) {
+         if (!ctxNames[i].equals(tmp.getName()))
+         {
             PortalJsp.log.warn("The context you called: " + ctxNames[i] + " does not match " + tmp.getName());
             return "";
          }
       }
-      
-      if (contextStack.get(i) != null) {
+
+      if (contextStack.get(i) != null)
+      {
          NamedContext ctx = (NamedContext)contextStack.get(i);
          return ((Context)ctx.getContext()).get(ctxNames[ctxNames.length - 1]);
-      } else {
+      }
+      else
+      {
          PortalJsp.log.warn("There is no such context for " + key);
          return "";
       }

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/SuccessTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib;
 
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+
+import javax.portlet.PortletConfig;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Enumeration;
@@ -28,19 +34,13 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import javax.portlet.PortletConfig;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-
 /**
  * Infos tag. Used to include information messages.
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class SuccessTag
-      extends TagSupport
+   extends TagSupport
 {
 
    /** The serialVersionUID */
@@ -58,9 +58,9 @@
             print(writer, pageContext.getRequest().getParameter(name));
          }
       }
-      return SKIP_BODY; 
+      return SKIP_BODY;
    }
-   
+
    private void print(Writer writer, String key)
    {
       Locale locale = pageContext.getRequest().getLocale();
@@ -68,15 +68,17 @@
       ResourceBundle resourceBundle = portletConfig.getResourceBundle(locale);
       String translatedValue = key;
       try
-      { 
+      {
          translatedValue = resourceBundle.getString(key);
-      } catch (MissingResourceException e) {
+      }
+      catch (MissingResourceException e)
+      {
          PortalJsp.log.error("No such resource key in resource file: " + key);
       }
       try
       {
          writer.write("<span class=\"portlet-msg-success\">" + translatedValue + "</span><br/>\n");
-       }
+      }
       catch (IOException e)
       {
          // TODO Auto-generated catch block

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/AbstractContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/AbstractContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/AbstractContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 import java.util.Iterator;
@@ -33,10 +34,12 @@
    {
       throw new UnsupportedOperationException();
    }
+
    public String get(String o)
    {
       throw new UnsupportedOperationException();
    }
+
    public Context put(String key, String value)
    {
       throw new UnsupportedOperationException();

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/BuildException.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/BuildException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/BuildException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 /**

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/ChildrenStrategy.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/ChildrenStrategy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/ChildrenStrategy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 import java.util.Collections;

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/Context.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 import java.util.Collections;
@@ -58,44 +59,34 @@
 
    /**
     * get the template data from the context
-    * 
-    * @param key
-    *           template variable name
-    * 
+    *
+    * @param key template variable name
     * @return template value
     */
    public String get(String key);
 
    /**
     * add data to be rendered in the template through variable substitution
-    * 
-    * @param key
-    *           template variable name
-    * @param value
-    *           value to render in template
-    * 
+    *
+    * @param key   template variable name
+    * @param value value to render in template
     * @return context to place data into
     */
    public Context put(String key, String value);
 
    /**
     * add data to be rendered in the template through variable substitution
-    * 
-    * @param key
-    *           template variable name
-    * @param value
-    *           value to render in template
-    * 
+    *
+    * @param key   template variable name
+    * @param value value to render in template
     * @return context to place data into
     */
    public Context put(String key, Integer value);
 
    /**
     * get an iterator for the nested/loop data contexts
-    * 
-    * @param name
-    *           template variable prefix name
-    * 
+    *
+    * @param name template variable prefix name
     * @return iterator for the children
     */
    Iterator childIterator(String name);

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/DelegateContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 import java.util.HashMap;
@@ -30,7 +31,7 @@
  * @version $Revision$
  */
 public class DelegateContext
-      implements Context
+   implements Context
 {
    /** context's children */
    private ChildrenStrategy children;
@@ -38,9 +39,7 @@
    /** template name/value pairs for substitution */
    private Map delegate;
 
-   /**
-    * creates a new DelegateContext object.
-    */
+   /** creates a new DelegateContext object. */
    public DelegateContext()
    {
       this(new HashMap(), new HashMap());
@@ -48,11 +47,9 @@
 
    /**
     * creates a new DelegateContext object.
-    * 
-    * @param delegate
-    *           name/value pairs for "root" data
-    * @param children
-    *           name/value pairs for nested or loop data
+    *
+    * @param delegate name/value pairs for "root" data
+    * @param children name/value pairs for nested or loop data
     */
    public DelegateContext(Map delegate, Map children)
    {
@@ -61,12 +58,9 @@
    }
 
    /**
-    * create a new "root" data context and name/value pairs to be used as nested
-    * or loop data
-    * 
-    * @param children
-    *           name/value pairs for nested or loop data
-    * 
+    * create a new "root" data context and name/value pairs to be used as nested or loop data
+    *
+    * @param children name/value pairs for nested or loop data
     * @return context to continue adding template data too
     */
    public static final DelegateContext createWithChildren(Map children)
@@ -76,10 +70,8 @@
 
    /**
     * create a new data context with already existing name/value pairs
-    * 
-    * @param values
-    *           existing name/value pair map
-    * 
+    *
+    * @param values existing name/value pair map
     * @return context to continue adding template data too
     */
    public static final DelegateContext createWithValues(Map values)
@@ -88,42 +80,33 @@
    }
 
    /**
-    * add an existing data context into this context for use in template loops
-    * or nested template data.
-    * 
-    * @param name
-    *           variable prefix name
-    * @param ctx
-    *           context to add
+    * add an existing data context into this context for use in template loops or nested template data.
+    *
+    * @param name variable prefix name
+    * @param ctx  context to add
     */
    public void append(String name, Context ctx)
    {
       children.append(name, ctx);
    }
 
-   /**
-    * @see org.jboss.portal.core.servlet.jsp.taglib.context.Context#childIterator(java.lang.String)
-    */
+   /** @see org.jboss.portal.core.servlet.jsp.taglib.context.Context#childIterator(java.lang.String) */
    public Iterator childIterator(String name)
    {
       return children.childIterator(name);
    }
 
-   /**
-    * @see org.jboss.portal.core.servlet.jsp.taglib.context.Context#get(java.lang.String)
-    */
+   /** @see org.jboss.portal.core.servlet.jsp.taglib.context.Context#get(java.lang.String) */
    public String get(String key)
    {
-      return (String) delegate.get(key);
+      return (String)delegate.get(key);
    }
 
    /**
-    * create a new object to place data for use in template loops or nested
-    * template data. tpl var format: { prefix.VAR_NAME }
-    * 
-    * @param name
-    *           variable prefix name
-    * 
+    * create a new object to place data for use in template loops or nested template data. tpl var format: {
+    * prefix.VAR_NAME }
+    *
+    * @param name variable prefix name
     * @return delegate context that will contain the loop or nested data
     */
    public DelegateContext next(String name)
@@ -134,10 +117,7 @@
       return ctx;
    }
 
-   /**
-    * @see org.jboss.portal.core.servlet.jsp.taglib.context.Context#put(java.lang.String,
-    *      java.lang.String)
-    */
+   /** @see org.jboss.portal.core.servlet.jsp.taglib.context.Context#put(java.lang.String,java.lang.String) */
    public Context put(String key, String value)
    {
       delegate.put(key, value);

Modified: trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/servlet/jsp/taglib/context/NamedContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,70 +1,63 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.servlet.jsp.taglib.context;
 
 /**
  * POJO for a context linked to a name
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class NamedContext
-{	
+{
    private Context context;
-   
+
    private String name;
-   
+
    public NamedContext(String name, Context ctx)
    {
       this.name = name;
       this.context = ctx;
    }
-   
-   /**
-    * @return Returns the contedxt.
-    */
+
+   /** @return Returns the contedxt. */
    public Context getContext()
    {
       return context;
    }
 
-   /**
-    * @return Returns the name.
-    */
+   /** @return Returns the name. */
    public String getName()
    {
       return name;
    }
 
-   /**
-    * @param context The context to set.
-    */
+   /** @param context The context to set. */
    public void setContext(Context context)
    {
       this.context = context;
    }
 
-   /**
-    * @param name The name to set.
-    */
+   /** @param name The name to set. */
    public void setName(String name)
    {
       this.name = name;

Modified: trunk/core/src/main/org/jboss/portal/core/util/ProxyValidator.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/util/ProxyValidator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/util/ProxyValidator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.util;
 
 import java.lang.reflect.Method;
@@ -36,6 +37,7 @@
 {
 
    private static final Set acceptedClasses = new HashSet();
+
    static
    {
       acceptedClasses.add(String.class);
@@ -59,47 +61,51 @@
    public static final int SETTER_INVALID_NAME = 8;
    public static final int SETTER_NO_ARGUMENT = 9;
    public static final int SETTER_TOO_MANY_ARGUMENTS = 10;
-   public static final int SETTER_RETURN_TYPE_IS_NOT_VOID =11;
+   public static final int SETTER_RETURN_TYPE_IS_NOT_VOID = 11;
    public static final int SETTER_INVALID_ARGUMENT_TYPE = 12;
 
    // 0 == method
    // 1 == method name
    private static final String[] DESCRIPTIONS =
-   {
-      "Method {0} is not an accessor",
-      "Name {1} is not valid",
-      "Name {1} is duplicated",
-      "Method {0} has an invalid return type",
-      "Method {0} has no argument",
-      "Method {0} has too many arguments",
-      "Method {0} does not have a return type matching the argument type",
-      "Name {1} is duplicated",
-      "Name {1} is not valid",
-      "Method {0} has no argument",
-      "Method {0} has too many arguments",
-      "Method {0} has return type which is not void",
-      "Method {0} has an invalid argument type",
-   };
+      {
+         "Method {0} is not an accessor",
+         "Name {1} is not valid",
+         "Name {1} is duplicated",
+         "Method {0} has an invalid return type",
+         "Method {0} has no argument",
+         "Method {0} has too many arguments",
+         "Method {0} does not have a return type matching the argument type",
+         "Name {1} is duplicated",
+         "Name {1} is not valid",
+         "Method {0} has no argument",
+         "Method {0} has too many arguments",
+         "Method {0} has return type which is not void",
+         "Method {0} has an invalid argument type",
+      };
 
    public static class Error
    {
       private int code;
       private Method method;
       private String desc;
+
       public Error(int code, Method method)
       {
          this.code = code;
          this.method = method;
          desc = MessageFormat.format(DESCRIPTIONS[code], new Object[]{method, method.getName()});
       }
+
       public int getCode()
       {
          return code;
       }
+
       public Method getMethod()
       {
          return method;
       }
+
       public String getDescription()
       {
          return desc;
@@ -117,7 +123,7 @@
       Method[] methods = itf.getMethods();
       Set getters = new HashSet();
       Set setters = new HashSet();
-      for (int i = 0;i < methods.length;i++)
+      for (int i = 0; i < methods.length; i++)
       {
          Method method = methods[i];
          String methodName = method.getName();

Modified: trunk/core/src/main/org/jboss/portal/core/util/RewriteHelper.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/util/RewriteHelper.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/core/util/RewriteHelper.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.core.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Rewrite helper class.
- * <p>This class features a set of methods to rewrite markup content with unique identifiers. It can be used
- * for WSRP consumer rewrite. The default implementation of all methods replaces the 'wsrp_rewrite_' token with
- * the provided prefix token.</p>
+ * Rewrite helper class. <p>This class features a set of methods to rewrite markup content with unique identifiers. It
+ * can be used for WSRP consumer rewrite. The default implementation of all methods replaces the 'wsrp_rewrite_' token
+ * with the provided prefix token.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -39,32 +39,29 @@
    private static Pattern WSRP_REWRITE_TOKEN = Pattern.compile("wsrp_rewrite_");
 
    /**
-    * Constant to signal in a portlet that rewrite is requested.
-    * <p>A portlet can set this flag as a response property (set to "true") to signal to the theme layer that the
-    * content needs to be rewritten. If the flag is set the theme layer will detect it and replace all 'wsrp_rewite_'
-    * tokens with the provided prefix</p>
+    * Constant to signal in a portlet that rewrite is requested. <p>A portlet can set this flag as a response property
+    * (set to "true") to signal to the theme layer that the content needs to be rewritten. If the flag is set the theme
+    * layer will detect it and replace all 'wsrp_rewite_' tokens with the provided prefix</p>
     */
    public static final String REWRITE_FLAG = "WSRP_REWRITE";
 
    /**
-    * Constant to set a prefix value to use during the rewrite.
-    * <p>This prefix is equivalent to the producer write paradigm defined in WSRP. The portlet can set any arbitrary
-    * value to use for the rewrite, by providing this token as a response property. It is up to the portlet to decide
-    * where to get the value from.</p>
+    * Constant to set a prefix value to use during the rewrite. <p>This prefix is equivalent to the producer write
+    * paradigm defined in WSRP. The portlet can set any arbitrary value to use for the rewrite, by providing this token
+    * as a response property. It is up to the portlet to decide where to get the value from.</p>
     */
    public static final String NAMESPACE_PREFIX = "WSRP_NAMESPACE_PREFIX";
 
    /**
-    * Constant to set the content that should be injected into the HEAD tag of the pages markup.
-    * <p>The content set in a portlet response property with this flag will be injected into the HEAD tag, if the portal
-    * layout features the headercontent tag.</p>
+    * Constant to set the content that should be injected into the HEAD tag of the pages markup. <p>The content set in a
+    * portlet response property with this flag will be injected into the HEAD tag, if the portal layout features the
+    * headercontent tag.</p>
     */
    public static final String HEADER_CONTENT = "HEADER_CONTENT";
 
    /**
-    * Rewrite the content.
-    * <p>Rewrite the provided content by parsing for the 'wsrp_rewrite_' token and replacing it with the
-    * provided <code>prefix</code>.</p>
+    * Rewrite the content. <p>Rewrite the provided content by parsing for the 'wsrp_rewrite_' token and replacing it
+    * with the provided <code>prefix</code>.</p>
     *
     * @param content the content to parse and potentially rewrite
     * @param prefix  the replacement string for the 'wsrp_rewrite_' token(s)
@@ -76,9 +73,8 @@
    }
 
    /**
-    * Rewrite the content.
-    * <p>Rewrite the provided content by parsing for the provided pattern, and replacing each occurence with
-    * the provided prefix.</p>
+    * Rewrite the content. <p>Rewrite the provided content by parsing for the provided pattern, and replacing each
+    * occurence with the provided prefix.</p>
     *
     * @param pattern the compiled regular expression to parse the content for
     * @param content the content to parse and potentially rewrite

Modified: trunk/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/CorePortletPreferencesTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.util.Arrays;
+import junit.framework.TestCase;
+import org.jboss.portlet.JBossPortletPreferences;
 
 import javax.portlet.ReadOnlyException;
+import java.util.Arrays;
 
-import junit.framework.TestCase;
-
-import org.jboss.portlet.JBossPortletPreferences;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -136,14 +135,14 @@
 
    public void testSetIntArray()
    {
-      proxy.setIntArray(new int[]{0,1,2});
-      assertTrue(Arrays.equals(new String[]{"0","1","2"}, prefs.getValues("IntArray", null)));
+      proxy.setIntArray(new int[]{0, 1, 2});
+      assertTrue(Arrays.equals(new String[]{"0", "1", "2"}, prefs.getValues("IntArray", null)));
    }
 
    public void testGetExistingIntArray() throws ReadOnlyException
    {
-      prefs.setValues("IntArray", new String[]{"0","1","2"});
-      assertTrue(Arrays.equals(new int[]{0,1,2}, proxy.getIntArray(new int[]{-1})));
+      prefs.setValues("IntArray", new String[]{"0", "1", "2"});
+      assertTrue(Arrays.equals(new int[]{0, 1, 2}, proxy.getIntArray(new int[]{-1})));
 
       prefs.setValues("IntArray", new String[]{"not a number"});
       assertTrue(Arrays.equals(new int[]{-1}, proxy.getIntArray(new int[]{-1})));
@@ -179,14 +178,14 @@
 
    public void testSetBooleanArray()
    {
-      proxy.setBooleanArray(new boolean[]{true,false});
-      assertTrue(Arrays.equals(new String[]{"true","false"}, prefs.getValues("BooleanArray", null)));
+      proxy.setBooleanArray(new boolean[]{true, false});
+      assertTrue(Arrays.equals(new String[]{"true", "false"}, prefs.getValues("BooleanArray", null)));
    }
 
    public void testGetExistingBooleanArray() throws ReadOnlyException
    {
-      prefs.setValues("BooleanArray", new String[]{"true","false"});
-      assertTrue(Arrays.equals(new boolean[]{true,false}, proxy.getBooleanArray(new boolean[]{true})));
+      prefs.setValues("BooleanArray", new String[]{"true", "false"});
+      assertTrue(Arrays.equals(new boolean[]{true, false}, proxy.getBooleanArray(new boolean[]{true})));
 
       prefs.setValues("BooleanArray", new String[]{"not a boolean"});
       assertTrue(Arrays.equals(new boolean[]{true}, proxy.getBooleanArray(new boolean[]{true})));
@@ -203,17 +202,27 @@
    public interface TestProxy
    {
       int getInt(int dflt);
+
       String getString(String dflt);
+
       boolean getBoolean(boolean dflt);
+
       int[] getIntArray(int[] dflt);
+
       String[] getStringArray(String[] dflt);
+
       boolean[] getBooleanArray(boolean[] dflt);
 
       void setString(String value);
+
       void setStringArray(String[] value);
+
       void setInt(int value);
+
       void setIntArray(int[] value);
+
       void setBoolean(boolean value);
+
       void setBooleanArray(boolean[] value);
    }
 }

Modified: trunk/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/HttpServletRequestWrapperImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,56 +1,53 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.util.Locale;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+import java.util.Locale;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class HttpServletRequestWrapperImpl
-      extends HttpServletRequestWrapper
+   extends HttpServletRequestWrapper
 {
 
    private Locale locale;
-   
-   /**
-    * @param arg0
-    */
+
+   /** @param arg0  */
    public HttpServletRequestWrapperImpl(HttpServletRequest request)
    {
       super(request);
    }
 
-   public void setLocale(Locale locale) {
+   public void setLocale(Locale locale)
+   {
       this.locale = locale;
    }
-   
-   public Locale getLocale() {
+
+   public Locale getLocale()
+   {
       return locale;
    }
-   
-   
+
+
 }

Modified: trunk/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/I18nELTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
+import org.apache.cactus.JspTestCase;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
+import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
+import org.jboss.portal.portlet.impl.jsr168.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;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,29 +40,15 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.portlet.PortletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cactus.JspTestCase;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
-import org.jboss.portal.portlet.impl.jsr168.PortletConfigImpl;
-import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
-import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
-
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class I18nELTestCase
-      extends JspTestCase
+   extends JspTestCase
 {
    private static final String RESOURCE_BUNDLE_NAME = "MyResourceBundle";
 
 
-   public void test01() throws ServletException, IOException {
+   public void test01() throws ServletException, IOException
+   {
       PortalJsp jbossJsp = new PortalJsp()
       {
          public void _jspService(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException

Modified: trunk/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/I18nOutELTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
+import org.apache.cactus.JspTestCase;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
+import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
+import org.jboss.portal.portlet.impl.jsr168.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;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,31 +42,15 @@
 import java.util.Locale;
 import java.util.Map;
 
-import javax.portlet.PortletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.cactus.JspTestCase;
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
-import org.jboss.portal.portlet.impl.jsr168.PortletConfigImpl;
-import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
-import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
-
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class I18nOutELTestCase
-      extends JspTestCase
+   extends JspTestCase
 {
    private static final String RESOURCE_BUNDLE_NAME = "MyResourceBundle";
 
 
-   public void test01() throws ServletException, IOException {
+   public void test01() throws ServletException, IOException
+   {
       PortalJsp jbossJsp = new PortalJsp()
       {
          public void _jspService(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException

Modified: trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/IfTagTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-
 import org.apache.cactus.ServletTestCase;
 import org.apache.cactus.WebResponse;
 import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$
- */
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class IfTagTestCase
-      extends ServletTestCase
+   extends ServletTestCase
 
 {
    /**
     * If condition is not verified
-    * 
+    *
     * @throws ServletException
     * @throws IOException
     */
@@ -56,7 +54,7 @@
 
    /**
     * If condition is verified
-    * 
+    *
     * @throws ServletException
     * @throws IOException
     */

Modified: trunk/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/IncludeTagTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.io.IOException;
+import org.apache.cactus.JspTestCase;
+import org.apache.cactus.WebResponse;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
+import java.io.IOException;
 
-import org.apache.cactus.JspTestCase;
-import org.apache.cactus.WebResponse;
-
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class IncludeTagTestCase
-      extends JspTestCase
+   extends JspTestCase
 {
    public void test01() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testInclude01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testInclude01.jsp");
       rd.forward(request, response);
    }
-   
+
    public void end01(WebResponse webResponse)
    {
       assertEquals("BeginInclude:Include:EndInclude", webResponse.getText().replaceAll("[ \n\t]", ""));
@@ -51,15 +48,14 @@
    public void test02() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testInclude03.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testInclude03.jsp");
       rd.forward(request, response);
    }
-   
+
    public void end02(WebResponse webResponse)
    {
       assertEquals("Foo:BeginInclude:Include:EndInclude:Bar", webResponse.getText().replaceAll("[ \n\t]", ""));
    }
 
-   
-   
+
 }

Modified: trunk/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/IterateTagTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,57 +1,55 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.io.IOException;
+import org.apache.cactus.ServletTestCase;
+import org.apache.cactus.WebResponse;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
+import java.io.IOException;
 
-import org.apache.cactus.ServletTestCase;
-import org.apache.cactus.WebResponse;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
+public class IterateTagTestCase
+   extends ServletTestCase
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
-public class IterateTagTestCase
-      extends ServletTestCase
-      
-      
+
 {
    /**
     * If condition is not verified
+    *
     * @throws ServletException
     * @throws IOException
     */
    public void testIterateNone() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testIterate01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testIterate01.jsp");
       rd.forward(request, response);
    }
-   
+
    public void endIterateNone(WebResponse webResponse)
    {
       assertEquals("", webResponse.getText().trim());
@@ -59,33 +57,35 @@
 
    /**
     * If condition is verified
+    *
     * @throws ServletException
     * @throws IOException
     */
    public void testIterateOnce() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testIterate01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testIterate01.jsp");
       DelegateContext context = new DelegateContext();
       context.next("row");
       request.setAttribute(PortalJsp.CTX_REQUEST, context);
       rd.forward(request, response);
    }
-   
+
    public void endIterateOnce(WebResponse webResponse)
    {
       assertEquals("Some text", webResponse.getText().trim());
    }
-   
+
    /**
     * If condition is verified
+    *
     * @throws ServletException
     * @throws IOException
     */
    public void testIterateFive() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testIterate01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testIterate01.jsp");
       DelegateContext context = new DelegateContext();
       context.next("row");
       context.next("row");
@@ -95,7 +95,7 @@
       request.setAttribute(PortalJsp.CTX_REQUEST, context);
       rd.forward(request, response);
    }
-   
+
    public void endIterateFive(WebResponse webResponse)
    {
       assertEquals("Some textSome textSome textSome textSome text", webResponse.getText().trim());
@@ -103,13 +103,14 @@
 
    /**
     * If condition is verified
+    *
     * @throws ServletException
     * @throws IOException
     */
    public void testDoubleIterate() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testIterate02.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testIterate02.jsp");
       DelegateContext context = new DelegateContext();
       DelegateContext row1 = context.next("row");
       DelegateContext row2 = context.next("row");
@@ -118,21 +119,22 @@
       request.setAttribute(PortalJsp.CTX_REQUEST, context);
       rd.forward(request, response);
    }
-   
+
    public void endDoubleIterate(WebResponse webResponse)
    {
       assertEquals("ACABBC", webResponse.getText().trim());
    }
-   
+
    /**
     * If condition is verified
+    *
     * @throws ServletException
     * @throws IOException
     */
    public void testTripleIterate() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testIterate03.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testIterate03.jsp");
       DelegateContext context = new DelegateContext();
       DelegateContext row1 = context.next("row");
       DelegateContext row2 = context.next("row");
@@ -142,7 +144,7 @@
       request.setAttribute(PortalJsp.CTX_REQUEST, context);
       rd.forward(request, response);
    }
-   
+
    public void endTripleIterate(WebResponse webResponse)
    {
       assertEquals("ADABBCD", webResponse.getText().trim());

Modified: trunk/core/src/main/org/jboss/portal/test/core/MapperTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/MapperTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/MapperTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
 import junit.framework.TestCase;
 import org.jboss.portal.core.impl.invocation.Mapper;
-import org.jboss.portal.core.impl.invocation.SimpleMapper;
 import org.jboss.portal.core.impl.invocation.MappingContext;
 import org.jboss.portal.core.impl.invocation.MappingResult;
+import org.jboss.portal.core.impl.invocation.SimpleMapper;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -46,7 +47,7 @@
 
    protected void setUp() throws Exception
    {
-     mapper = new SimpleMapper();
+      mapper = new SimpleMapper();
    }
 
    protected void tearDown() throws Exception
@@ -123,25 +124,30 @@
    private static class Context
    {
       private final Map children;
+
       public Context(Object dflt)
       {
          children = new HashMap();
       }
+
       public void addChild(String name, Object child)
       {
          children.put(name, child);
       }
    }
+
    private static class MappingContextImpl extends Context implements MappingContext
    {
       public MappingContextImpl(Object dflt)
       {
          super(dflt);
       }
+
       public Object getRoot()
       {
          return this;
       }
+
       public Object getChild(Object parent, String name)
       {
          return ((Context)parent).children.get(name);

Modified: trunk/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/OutELTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/OutELTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,53 +1,54 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.io.IOException;
+import org.apache.cactus.JspTestCase;
+import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
+import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
-import org.apache.cactus.JspTestCase;
-import org.jboss.portal.core.servlet.jsp.taglib.context.Context;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
-import org.jboss.portal.core.servlet.jsp.PortalJsp;
-import org.jboss.portal.core.servlet.jsp.taglib.PortalLib;
-
 /**
  * Test the out EL
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
+ *
+ * @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$
  */
 public class OutELTestCase
-      extends JspTestCase
+   extends JspTestCase
 {
 
-   public void test01() throws ServletException, IOException {
+   public void test01() throws ServletException, IOException
+   {
       /**
-      ServletRequest request = new HttpServletRequestImpl();
-      ServletResponse response = new HttpServletResponseImpl();
-    */
-      
+       ServletRequest request = new HttpServletRequestImpl();
+       ServletResponse response = new HttpServletResponseImpl();
+       */
+
       PortalJsp jbossJsp = new PortalJsp()
       {
          public void _jspService(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException
@@ -55,15 +56,14 @@
             assertEquals("value", PortalLib.out("key"));
          }
       };
-      
+
       Context ctx = new DelegateContext();
       ctx.put("key", "value");
       request.setAttribute(PortalJsp.CTX_REQUEST, ctx);
-            
+
       jbossJsp.service(request, response);
       jbossJsp.destroy();
    }
-   
-   
-   
+
+
 }

Modified: trunk/core/src/main/org/jboss/portal/test/core/PageTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/PageTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/PageTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
 import junit.framework.TestCase;

Modified: trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/PortalBaseTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*
  * JBoss, the OpenSource J2EE webOS
  *
@@ -3,25 +26,15 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
- */ 
+ */
 package org.jboss.portal.test.core;
 
-import java.security.Policy;
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.security.auth.Subject; 
-import javax.security.jacc.PolicyContext;
-
 import junit.framework.TestCase;
-
 import org.apache.log4j.Appender;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
+import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.SecurityConstants;
-import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.test.framework.TestRuntimeContext;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
@@ -32,16 +45,23 @@
 import org.jboss.security.SimplePrincipal;
 import org.jboss.security.jacc.DelegatingPolicy;
 
+import javax.security.auth.Subject;
+import javax.security.jacc.PolicyContext;
+import java.security.Policy;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
- *  Base Test Case for Portal Core
- *  Contains common methods used by the test framework
+ * Base Test Case for Portal Core Contains common methods used by the test framework
  *
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Apr 7, 2006
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @version $Revision$
+ * @since Apr 7, 2006
  */
 public abstract class PortalBaseTestCase extends TestCase
-{   
+{
 
    /** . */
    protected TestRuntimeContext runtimeContext;
@@ -58,8 +78,8 @@
       Logger.getRoot().addAppender(appender);
       Logger.getRoot().setLevel(Level.DEBUG);
       Logger.getLogger("org.hibernate").setLevel(Level.ERROR);
-   } 
-   
+   }
+
    public HibernateSupport getHibernate()
    {
       return hibernate;
@@ -73,19 +93,19 @@
    public String getName()
    {
       return super.getName() + "_" + dsCfg.getDriverClass().replaceAll("\\.", "_");
-   }  
-   
+   }
+
    protected Set getDefaultSecurityConstraints()
    {
       Set constraints = new HashSet();
       constraints.add(new RoleSecurityBinding("view", SecurityConstants.UNCHECKED_ROLE_NAME));
       return constraints;
    }
-   
+
    protected Set getSecurityConstraints(String perm, String role)
    {
       Set constraints = new HashSet();
-      constraints.add(new RoleSecurityBinding(perm,role));
+      constraints.add(new RoleSecurityBinding(perm, role));
       return constraints;
    }
 
@@ -93,7 +113,7 @@
    {
       // Setup custom policy
    }
-   
+
    protected void setUp() throws Exception
    {
       runtimeContext = new TestRuntimeContext(getConfigLocation());
@@ -106,7 +126,7 @@
    }
 
    protected void tearDown() throws Exception
-   { 
+   {
       /**
        * Need to delete the context information set in the policy provider
        * for this test as it will affect the next test that is being run.
@@ -118,9 +138,7 @@
       runtimeContext.stop();
    }
 
-   /**
-    * Override to provide the location of the microcontainer xml
-    */
+   /** Override to provide the location of the microcontainer xml */
    protected abstract String getConfigLocation();
 
    protected void setUpSubjectForRole(String username, String[] roleNames) throws Exception

Modified: trunk/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/ProxyValidatorTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.util.List;
-
 import junit.framework.TestCase;
-
 import org.jboss.portal.core.util.ProxyValidator;
 
+import java.util.List;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -62,6 +62,7 @@
    public interface GetterDuplicateName
    {
       int getA(int a);
+
       boolean getA(boolean a);
    }
 
@@ -141,6 +142,7 @@
    public interface SetterDuplicateName
    {
       void setA(int a);
+
       void setA(boolean a);
    }
 

Modified: trunk/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/TagLibTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,50 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-
 import org.apache.cactus.JspTestCase;
 import org.apache.cactus.WebResponse;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import java.io.IOException;
+
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class TagLibTestCase
-      extends JspTestCase
+   extends JspTestCase
 {
    public void test01() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
       rd.forward(request, response);
    }
-   
+
    public void end01(WebResponse webResponse)
    {
       assertEquals(":::", webResponse.getText().replaceAll("[ \n\t]", ""));
@@ -53,7 +50,7 @@
    public void test02() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
       DelegateContext context = new DelegateContext();
       context.put("foo", "FOO");
       context.put("bar", "BAR");
@@ -61,7 +58,7 @@
 
       rd.forward(request, response);
    }
-   
+
    public void end02(WebResponse webResponse)
    {
       assertEquals("FOO:FOO:BAR:BAR", webResponse.getText().replaceAll("[ \n\t]", ""));
@@ -70,7 +67,7 @@
    public void test03() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
       DelegateContext context = new DelegateContext();
       context.put("foo", "FOO");
       context.put("bar", "BAR");
@@ -79,7 +76,7 @@
 
       rd.forward(request, response);
    }
-   
+
    public void end03(WebResponse webResponse)
    {
       assertEquals("FOO:FOO::BAR:BAR", webResponse.getText().replaceAll("[ \n\t]", ""));
@@ -88,7 +85,7 @@
    public void test04() throws ServletException, IOException
    {
       RequestDispatcher rd = config.getServletContext().
-      getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
+         getRequestDispatcher("/WEB-INF/jsp/test/testTaglib01.jsp");
       DelegateContext context = new DelegateContext();
       context.put("foo", "FOO");
       context.put("bar", "BAR");
@@ -98,7 +95,7 @@
 
       rd.forward(request, response);
    }
-   
+
    public void end04(WebResponse webResponse)
    {
       assertEquals("FOO:FOO:VALUE:BAR:BAR", webResponse.getText().replaceAll("[ \n\t]", ""));

Modified: trunk/core/src/main/org/jboss/portal/test/core/Utils.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/Utils.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/Utils.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core;
 
-import java.io.FileInputStream;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-
 import org.dbunit.database.DatabaseConnection;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.dataset.xml.FlatXmlDataSet;
 import org.jboss.portal.common.util.Tools;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a>
- * $Revision$
- */
+import java.io.FileInputStream;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class Utils
 {
 
@@ -46,20 +44,21 @@
 
    public static IDataSet getDataSet(String file) throws Exception
    {
-       return new FlatXmlDataSet(Tools.safeBufferedWrapper(new FileInputStream(file)));
+      return new FlatXmlDataSet(Tools.safeBufferedWrapper(new FileInputStream(file)));
    }
 
    public static IDatabaseConnection getConnection() throws Exception
    {
-       Class driverClass = Class.forName("org.gjt.mm.mysql.Driver");
-       Connection jdbcConnection = DriverManager.getConnection(
-               url, username, password);
-       return new DatabaseConnection(jdbcConnection);
+      Class driverClass = Class.forName("org.gjt.mm.mysql.Driver");
+      Connection jdbcConnection = DriverManager.getConnection(
+         url, username, password);
+      return new DatabaseConnection(jdbcConnection);
    }
 
-   public static void resetAutoIncrement() throws SQLException {
+   public static void resetAutoIncrement() throws SQLException
+   {
       Connection jdbcConnection = DriverManager.getConnection(
-            url, username, password);
+         url, username, password);
       Statement stmt = jdbcConnection.createStatement();
       stmt.execute("alter table jbp_roles auto_increment=1");
    }

Modified: trunk/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/deployment/JBossApplicationMetaDataFactoryTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.core.deployment;
 

Modified: trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*
  * JBoss, the OpenSource J2EE webOS
  *
@@ -6,66 +29,62 @@
  */
 package org.jboss.portal.test.core.model.instance;
 
+import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import junit.framework.TestCase;
+import org.apache.log4j.Appender;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
 import org.hibernate.Session;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.junit.TestCaseFactory;
+import org.jboss.portal.common.junit.TransactionAssert;
+import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
+import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
+import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl;
+import org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl;
 import org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer;
-import org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl;
-import org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl;
 import org.jboss.portal.core.impl.portlet.state.PersistentStateStore;
 import org.jboss.portal.core.model.instance.Instance;
 import org.jboss.portal.core.model.instance.InstanceDefinition;
-import org.jboss.portal.portlet.test.support.info.PreferencesInfoSupport;
-import org.jboss.portal.portlet.test.support.PortletInvokerSupport;
-import org.jboss.portal.portlet.test.support.PortletSupport;
-import org.jboss.portal.portlet.test.ActionContextImpl;
-import org.jboss.portal.portlet.test.UserContextImpl;
-import org.jboss.portal.portlet.test.ValueMapAssert;
-import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
-import org.jboss.portal.portlet.state.AbstractPropertyContext;
-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.Mode;
 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.PortletInvoker;
-import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.info.MetaInfo;
 import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.state.AbstractPropertyContext;
+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.producer.ProducerPortletInvoker;
+import org.jboss.portal.portlet.test.ActionContextImpl;
+import org.jboss.portal.portlet.test.UserContextImpl;
+import org.jboss.portal.portlet.test.ValueMapAssert;
+import org.jboss.portal.portlet.test.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.test.support.PortletSupport;
+import org.jboss.portal.portlet.test.support.info.PreferencesInfoSupport;
+import org.jboss.portal.test.framework.TestRuntimeContext;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.embedded.HibernateSupport;
-import org.jboss.portal.common.junit.TransactionAssert;
-import org.jboss.portal.common.junit.TestCaseFactory;
-import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
-import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.common.value.StringValue;
-import org.jboss.portal.common.util.CollectionBuilder;
-import org.apache.log4j.Appender;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
 
 import java.net.URL;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
-import java.util.Map;
 
 /**
- * Test Case that tests the authorization for instances
- * via the instance container
+ * Test Case that tests the authorization for instances via the instance container
+ * <p/>
+ * todo : configure instance with POP todo : configure instance with CCP todo : duplicate instance name todo : clone
+ * before write without creating instance todo : destroy instance and all its children !!!!
  *
- * todo : configure instance with POP
- * todo : configure instance with CCP
- * todo : duplicate instance name
- * todo : clone before write without creating instance
- * todo : destroy instance and all its children !!!!
- *
  * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -397,7 +416,7 @@
             instance = instanceDef.getCustomization(identity);
          }
          PortletInvocation action = new ActionInvocation(new ActionContextImpl(Mode.VIEW));
-         action.setUserContext(identity == null ? new UserContextImpl() :new UserContextImpl(identity));
+         action.setUserContext(identity == null ? new UserContextImpl() : new UserContextImpl(identity));
          try
          {
             instance.invoke(action);
@@ -422,9 +441,7 @@
       }
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokePOPReadOnly() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite(null, false, false, TransactionAssert.MUST_COMMIT)
@@ -454,9 +471,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokeCCPReadOnly() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite(null, true, false, TransactionAssert.MUST_COMMIT)
@@ -486,9 +501,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void testInvokePOPCloneBeforeWrite() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite("julien", false, false, TransactionAssert.MUST_COMMIT)
@@ -523,9 +536,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokeCCPCloneBeforeWrite() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite("julien", true, false, TransactionAssert.MUST_COMMIT)
@@ -562,9 +573,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokePOPCloneBeforeWriteRollback() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite("julien", false, false, TransactionAssert.MUST_ROLLBACK)
@@ -586,9 +595,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokeCCPCloneBeforeWriteRollback() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite("julien", true, false, TransactionAssert.MUST_ROLLBACK)
@@ -610,9 +617,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokePOPCloneBeforeWritePortletThrowsRuntimeException() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite("julien", false, true, TransactionAssert.MARKED_AS_ROLLBACK)
@@ -634,9 +639,7 @@
       TransactionAssert.commitTransaction();
    }
 
-   /**
-    * .
-    */
+   /** . */
    public void _testInvokeCCPCloneBeforeWritePortletThrowsRuntimeException() throws Exception
    {
       TestCloneBeforeWrite test = new TestCloneBeforeWrite("julien", true, true, TransactionAssert.MARKED_AS_ROLLBACK)

Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,47 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.model.portal;
 
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-
 import junit.framework.TestSuite;
-
-
 import org.jboss.portal.core.impl.model.portal.PersistentPortalObjectContainer;
-import org.jboss.portal.core.model.portal.PortalObject;
 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.Portal;
+import org.jboss.portal.core.model.portal.PortalObject;
 import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl;
+import org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory;
 import org.jboss.portal.test.core.PortalBaseTestCase;
 import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory;
-import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URL;
+
 /**
  * Portal Object Container Test Cases based on the microcontainer architecture
+ *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:anil.saldhana at jboss.org">Anil Saldhana</a>
  * @version $Revision$
@@ -68,7 +68,7 @@
             Method method = methods[j];
             int modifiers = method.getModifiers();
             if (Modifier.isPublic(modifiers) && !Modifier.isAbstract(modifiers)
-                  && !Modifier.isStatic(modifiers) && method.getName().startsWith("test"))
+               && !Modifier.isStatic(modifiers) && method.getName().startsWith("test"))
             {
                PortalBaseTestCase testCase = new PortalObjectContainerTestCase(config);
                testCase.setName(method.getName());
@@ -124,9 +124,7 @@
       container = null;
    }
 
-   /**
-    * todo same with a transaction wrapping the start method
-    */
+   /** todo same with a transaction wrapping the start method */
    public void testRootNodeCreatedDuringStartup() throws Exception
    {
 //      container.setCreateRootOnStartup(false);

Modified: trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectPermissionTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.model.portal;
 
 import org.jboss.portal.core.model.portal.PortalObjectPermission;
-import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.security.spi.provider.PermissionFactory;
-import org.jboss.portal.security.RoleSecurityBinding;
+import org.jboss.portal.identity.auth.UserPrincipal;
 import org.jboss.portal.security.PortalPermission;
+import org.jboss.portal.security.PortalPermissionCollection;
 import org.jboss.portal.security.PortalSecurityException;
-import org.jboss.portal.security.PortalPermissionCollection;
+import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.impl.jacc.JACCPortalPermissionCollection;
+import org.jboss.portal.security.spi.provider.AuthorizationDomain;
+import org.jboss.portal.security.spi.provider.PermissionFactory;
+import org.jboss.portal.test.security.BaseAuthorizationDomain;
 import org.jboss.portal.test.security.PortalPermissionTestCase;
-import org.jboss.portal.test.security.BaseAuthorizationDomain;
 import org.jboss.portal.test.security.Server;
-import org.jboss.portal.identity.auth.UserPrincipal;
 import org.jboss.security.SimplePrincipal;
 
 import javax.security.auth.Subject;
+import java.security.Principal;
 import java.util.Collection;
 import java.util.Collections;
-import java.security.Principal;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -179,6 +180,7 @@
          {
             return "portalobject";
          }
+
          public PermissionFactory getPermissionFactory()
          {
             return new PermissionFactory()
@@ -187,10 +189,12 @@
                {
                   return new PortalObjectPermission(collection);
                }
+
                public PortalPermission createPermission(String uri, String action) throws PortalSecurityException
                {
                   return new PortalObjectPermission(uri, action);
                }
+
                public PortalPermission createPermission(String uri, Collection actions) throws PortalSecurityException
                {
                   return new PortalObjectPermission(uri, actions);

Modified: trunk/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/portlet/RolePortletTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.portlet;
 
 import net.sourceforge.jwebunit.WebTestCase;
-
 import org.dbunit.Assertion;
 import org.dbunit.DatabaseUnitException;
 import org.dbunit.database.IDatabaseConnection;
@@ -30,68 +30,68 @@
 import org.dbunit.operation.DatabaseOperation;
 import org.jboss.portal.test.core.Utils;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a>
- * $Revision$
- */
-public class RolePortletTestCase extends WebTestCase {
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
+public class RolePortletTestCase extends WebTestCase
+{
 
    protected void setUp() throws Exception
    {
-       super.setUp();
-       // initialize your database connection here
-       IDatabaseConnection connection = Utils.getConnection();
+      super.setUp();
+      // initialize your database connection here
+      IDatabaseConnection connection = Utils.getConnection();
 
-       // initialize your dataset here
-       IDataSet dataSet = Utils.getDataSet("resources/test/datarole.xml");
+      // initialize your dataset here
+      IDataSet dataSet = Utils.getDataSet("resources/test/datarole.xml");
 
-       try
-       {
-          Utils.resetAutoIncrement();
-          DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
-          
-       }
-       finally
-       {
-           connection.close();
-       }
+      try
+      {
+         Utils.resetAutoIncrement();
+         DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
+
+      }
+      finally
+      {
+         connection.close();
+      }
    }
 
-    public RolePortletTestCase(String name) {
-        super(name);
-        getTestContext().setBaseUrl("http://localhost.localdomain:8080/portal");
+   public RolePortletTestCase(String name)
+   {
+      super(name);
+      getTestContext().setBaseUrl("http://localhost.localdomain:8080/portal");
 //        getTestContext().setUserAgent("Mozilla");
-    }
-    
-    public void loginAdmin() {
-        beginAt("/index.html?_id=page.default.admin");
-        clickLink("standardlogin");
-        setFormElement("j_username", "admin");
-        setFormElement("j_password", "admin");
-        submit();
-    }
-    
-    public void testPresence()
-    {
-        loginAdmin();
-        assertLinkPresent("createRole");
-        assertLinkPresent("editRole");
-    }
+   }
 
-    public void testCreateRole()
-    {
-        loginAdmin();
-        clickLink("createRole");
-        assertFormPresent("createRole");
-        assertFormElementPresent("rolename");
-        assertFormElementPresent("roledisplayname");
-        setFormElement("rolename", "myRole");
-        setFormElement("roledisplayname", "myDisplayRole");
-        submit();
-        assertLinkPresent("createRole");
-        assertLinkPresent("editRole");
+   public void loginAdmin()
+   {
+      beginAt("/index.html?_id=page.default.admin");
+      clickLink("standardlogin");
+      setFormElement("j_username", "admin");
+      setFormElement("j_password", "admin");
+      submit();
+   }
 
-        try
+   public void testPresence()
+   {
+      loginAdmin();
+      assertLinkPresent("createRole");
+      assertLinkPresent("editRole");
+   }
+
+   public void testCreateRole()
+   {
+      loginAdmin();
+      clickLink("createRole");
+      assertFormPresent("createRole");
+      assertFormElementPresent("rolename");
+      assertFormElementPresent("roledisplayname");
+      setFormElement("rolename", "myRole");
+      setFormElement("roledisplayname", "myDisplayRole");
+      submit();
+      assertLinkPresent("createRole");
+      assertLinkPresent("editRole");
+
+      try
       {
          Assertion.assertEquals(Utils.getDataSet("resources/test/datarolecreated.xml").getTable("jbp_roles"), Utils.getConnection().createDataSet().getTable("jbp_roles"));
       }
@@ -105,60 +105,60 @@
          // TODO Auto-generated catch block
          e.printStackTrace();
       }
-    }
+   }
 
-    public void testEditRole()
-    {
-        loginAdmin();
-        clickLink("editRole");
-        assertFormPresent("editRole");
-        assertFormElementPresent("roleid");
-        assertFormElementPresent("roledisplayname");
-        setWorkingForm("editRole");
-        setFormElement("roleid", "2");
-        setFormElement("roledisplayname", "myNewDisplayRole");
-        submit();
-        assertLinkPresent("createRole");
-        assertLinkPresent("editRole");
-        try
-        {
-           Assertion.assertEquals(Utils.getDataSet("resources/test/dataroleedited.xml").getTable("jbp_roles"), Utils.getConnection().createDataSet().getTable("jbp_roles"));
-        }
-        catch (DatabaseUnitException e)
-        {
-           // TODO Auto-generated catch block
-           e.printStackTrace();
-        }
-        catch (Exception e)
-        {
-           // TODO Auto-generated catch block
-           e.printStackTrace();
-        }
-    }
+   public void testEditRole()
+   {
+      loginAdmin();
+      clickLink("editRole");
+      assertFormPresent("editRole");
+      assertFormElementPresent("roleid");
+      assertFormElementPresent("roledisplayname");
+      setWorkingForm("editRole");
+      setFormElement("roleid", "2");
+      setFormElement("roledisplayname", "myNewDisplayRole");
+      submit();
+      assertLinkPresent("createRole");
+      assertLinkPresent("editRole");
+      try
+      {
+         Assertion.assertEquals(Utils.getDataSet("resources/test/dataroleedited.xml").getTable("jbp_roles"), Utils.getConnection().createDataSet().getTable("jbp_roles"));
+      }
+      catch (DatabaseUnitException e)
+      {
+         // TODO Auto-generated catch block
+         e.printStackTrace();
+      }
+      catch (Exception e)
+      {
+         // TODO Auto-generated catch block
+         e.printStackTrace();
+      }
+   }
 
-    public void testDeleteRole()
-    {
-        loginAdmin();
-        clickLink("editRole");
-        assertFormPresent("deleteRole");
-        assertFormElementPresent("roleid");
-        setWorkingForm("deleteRole");
-        setFormElement("roleid", "2");
-        submit();
-        assertTextPresent("The role has been deleted");
-        try
-        {
-           Assertion.assertEquals(Utils.getDataSet("resources/test/dataroledeleted.xml").getTable("jbp_roles"), Utils.getConnection().createDataSet().getTable("jbp_roles"));
-        }
-        catch (DatabaseUnitException e)
-        {
-           // TODO Auto-generated catch block
-           e.printStackTrace();
-        }
-        catch (Exception e)
-        {
-           // TODO Auto-generated catch block
-           e.printStackTrace();
-        }
-    }
+   public void testDeleteRole()
+   {
+      loginAdmin();
+      clickLink("editRole");
+      assertFormPresent("deleteRole");
+      assertFormElementPresent("roleid");
+      setWorkingForm("deleteRole");
+      setFormElement("roleid", "2");
+      submit();
+      assertTextPresent("The role has been deleted");
+      try
+      {
+         Assertion.assertEquals(Utils.getDataSet("resources/test/dataroledeleted.xml").getTable("jbp_roles"), Utils.getConnection().createDataSet().getTable("jbp_roles"));
+      }
+      catch (DatabaseUnitException e)
+      {
+         // TODO Auto-generated catch block
+         e.printStackTrace();
+      }
+      catch (Exception e)
+      {
+         // TODO Auto-generated catch block
+         e.printStackTrace();
+      }
+   }
 }

Modified: trunk/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/portlet/UserPortletTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,137 +1,142 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.portlet;
 
+import net.sourceforge.jwebunit.WebTestCase;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.operation.DatabaseOperation;
 import org.jboss.portal.test.core.Utils;
 
-import net.sourceforge.jwebunit.WebTestCase;
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
+public class UserPortletTestCase extends WebTestCase
+{
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a>
- * $Revision$
- */
-public class UserPortletTestCase extends WebTestCase {
-
-    public UserPortletTestCase(String name) {
-        super(name);
-        getTestContext().setBaseUrl("http://localhost.localdomain:8080/portal");
+   public UserPortletTestCase(String name)
+   {
+      super(name);
+      getTestContext().setBaseUrl("http://localhost.localdomain:8080/portal");
 //        getTestContext().setUserAgent("Mozilla");
-    }
-    
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        // initialize your database connection here
-        IDatabaseConnection connection = Utils.getConnection();
+   }
 
-        // initialize your dataset here
-        IDataSet dataSet = Utils.getDataSet("resources/test/datarole.xml");
+   protected void setUp() throws Exception
+   {
+      super.setUp();
+      // initialize your database connection here
+      IDatabaseConnection connection = Utils.getConnection();
 
-        try
-        {
-           Utils.resetAutoIncrement();
-           DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
-           
-        }
-        finally
-        {
-            connection.close();
-        }
-    }
-    
-    public void testPresence() {
-        beginAt("/index.html");
-        assertLinkPresent("standardlogin");
-        assertLinkPresent("register");
-    }
+      // initialize your dataset here
+      IDataSet dataSet = Utils.getDataSet("resources/test/datarole.xml");
 
-    public void testClickRegister() {
-        beginAt("/index.html");
-        clickLink("register");
-        assertFormPresent("register");
-        assertFormElementPresent("uname");
-        assertFormElementPresent("pass1");
-        assertFormElementPresent("pass2");
-        assertFormElementPresent("realemail");
-        assertFormElementPresent("fakeemail");
-        assertFormElementPresent("question");
-        assertFormElementPresent("answer");
-        assertSubmitButtonPresent("register");
-        assertLinkPresent("login");
-    }
+      try
+      {
+         Utils.resetAutoIncrement();
+         DatabaseOperation.CLEAN_INSERT.execute(connection, dataSet);
 
-    public void testClickLogin() {
-       beginAt("/index.html");
-       clickLink("standardlogin");
-       assertFormPresent("loginform");
-       assertFormElementPresent("j_username");
-       assertFormElementPresent("j_password");
-       assertSubmitButtonPresent("login");
+      }
+      finally
+      {
+         connection.close();
+      }
    }
 
-    
-    public void testRegister() {
-        beginAt("/index.html");
-        clickLink("register");
-        setFormElement("uname", "testingDude");
-        setFormElement("pass1", "testingPassword");
-        setFormElement("pass2", "testingPassword");
-        setFormElement("realemail", "email at exemple.com");
-        submit();
-    }
-    
-    public void testUserLogin() {
-        beginAt("/index.html");
-        clickLink("standardlogin");
-        setFormElement("j_username", "user");
-        setFormElement("j_password", "user");
-        submit();
-        assertLinkPresent("editprofile");
-        assertLinkNotPresent("listusers");
-        assertLinkPresent("logout");
-    }
-    
-    public void testAdminLogin() {
-       beginAt("/index.html");
-       clickLink("standardlogin");
-       setFormElement("j_username", "admin");
-       setFormElement("j_password", "admin");
-       submit();
-       assertLinkPresent("editprofile");
-       assertLinkPresent("listusers");
-       assertLinkPresent("logout");
+   public void testPresence()
+   {
+      beginAt("/index.html");
+      assertLinkPresent("standardlogin");
+      assertLinkPresent("register");
    }
 
-    public void testLogout()
-    {
-       beginAt("/index.html");
-       clickLink("standardlogin");
-       setFormElement("j_username", "user");
-       setFormElement("j_password", "user");
-       submit();
-       clickLink("logout");
-       assertLinkPresent("standardlogin");
-    }
+   public void testClickRegister()
+   {
+      beginAt("/index.html");
+      clickLink("register");
+      assertFormPresent("register");
+      assertFormElementPresent("uname");
+      assertFormElementPresent("pass1");
+      assertFormElementPresent("pass2");
+      assertFormElementPresent("realemail");
+      assertFormElementPresent("fakeemail");
+      assertFormElementPresent("question");
+      assertFormElementPresent("answer");
+      assertSubmitButtonPresent("register");
+      assertLinkPresent("login");
+   }
+
+   public void testClickLogin()
+   {
+      beginAt("/index.html");
+      clickLink("standardlogin");
+      assertFormPresent("loginform");
+      assertFormElementPresent("j_username");
+      assertFormElementPresent("j_password");
+      assertSubmitButtonPresent("login");
+   }
+
+
+   public void testRegister()
+   {
+      beginAt("/index.html");
+      clickLink("register");
+      setFormElement("uname", "testingDude");
+      setFormElement("pass1", "testingPassword");
+      setFormElement("pass2", "testingPassword");
+      setFormElement("realemail", "email at exemple.com");
+      submit();
+   }
+
+   public void testUserLogin()
+   {
+      beginAt("/index.html");
+      clickLink("standardlogin");
+      setFormElement("j_username", "user");
+      setFormElement("j_password", "user");
+      submit();
+      assertLinkPresent("editprofile");
+      assertLinkNotPresent("listusers");
+      assertLinkPresent("logout");
+   }
+
+   public void testAdminLogin()
+   {
+      beginAt("/index.html");
+      clickLink("standardlogin");
+      setFormElement("j_username", "admin");
+      setFormElement("j_password", "admin");
+      submit();
+      assertLinkPresent("editprofile");
+      assertLinkPresent("listusers");
+      assertLinkPresent("logout");
+   }
+
+   public void testLogout()
+   {
+      beginAt("/index.html");
+      clickLink("standardlogin");
+      setFormElement("j_username", "user");
+      setFormElement("j_password", "user");
+      submit();
+      clickLink("logout");
+      assertLinkPresent("standardlogin");
+   }
 }

Modified: trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/state/ProducerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,61 +1,62 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.state;
 
 import junit.framework.TestCase;
 import org.apache.log4j.Appender;
 import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.test.framework.embedded.HibernateSupport;
+import org.jboss.portal.Mode;
 import org.jboss.portal.common.junit.TransactionAssert;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.portlet.test.ValueMapAssert;
-import org.jboss.portal.portlet.test.ActionContextImpl;
-import org.jboss.portal.portlet.test.UserContextImpl;
-import org.jboss.portal.portlet.test.InstanceContextImpl;
+import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.core.impl.portlet.state.PersistentStateStore;
 import org.jboss.portal.core.impl.portlet.state.ProducerPortletInvoker;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.state.producer.ProducerState;
-import org.jboss.portal.portlet.state.producer.ProducerStateContext;
 import org.jboss.portal.portlet.state.AbstractPropertyContext;
+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.AccessMode;
+import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.portlet.state.SimplePropertyMap;
-import org.jboss.portal.portlet.state.DestroyCloneFailure;
-import org.jboss.portal.portlet.test.support.info.PreferencesInfoSupport;
+import org.jboss.portal.portlet.state.producer.ProducerState;
+import org.jboss.portal.portlet.state.producer.ProducerStateContext;
+import org.jboss.portal.portlet.test.ActionContextImpl;
+import org.jboss.portal.portlet.test.InstanceContextImpl;
+import org.jboss.portal.portlet.test.UserContextImpl;
+import org.jboss.portal.portlet.test.ValueMapAssert;
 import org.jboss.portal.portlet.test.support.PortletInvokerSupport;
 import org.jboss.portal.portlet.test.support.PortletSupport;
-import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.portlet.test.support.info.PreferencesInfoSupport;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DataSourceSupport;
+import org.jboss.portal.test.framework.embedded.HibernateSupport;
 
 import java.util.Collections;
 import java.util.List;
@@ -160,6 +161,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public PortletInvocationResponse invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -174,6 +176,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public PortletInvocationResponse invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -188,6 +191,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public PortletInvocationResponse invoke(PortletInvocation invocation)
          {
             try
@@ -209,6 +213,7 @@
             PreferencesInfoSupport prefs = info.getPreferencesSupport();
             prefs.addPreference("abc", new StringValue("def"));
          }
+
          public PortletInvocationResponse invoke(PortletInvocation invocation)
          {
             AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.REQUEST_SCOPE, PortletInvocation.PREFERENCES_ATTRIBUTE);
@@ -580,9 +585,7 @@
 
    }
 
-   /**
-    * todo : should check the portlet metadata as well
-    */
+   /** todo : should check the portlet metadata as well */
    public void testGetPortlet() throws Exception
    {
       // Clone a POP

Modified: trunk/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/theme/UserThemeTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.theme;
 
 import net.sourceforge.jwebunit.WebTestCase;
@@ -44,15 +45,16 @@
       super.setUp();
    }
 
-   protected void assertString(String str) {
-      boolean isFound = getTester().getDialog().getResponseText().indexOf(str)>=0 ? true : false;
+   protected void assertString(String str)
+   {
+      boolean isFound = getTester().getDialog().getResponseText().indexOf(str) >= 0 ? true : false;
       assertTrue("Unable to locate [" + str + "] ", isFound);
    }
 
-   public void testChangeTheme() 
+   public void testChangeTheme()
    {
       beginAt("/index.html");
-      clickLink("standardlogin"); 
+      clickLink("standardlogin");
       setFormElement("j_username", "user");
       setFormElement("j_password", "user");
       submit();
@@ -71,9 +73,10 @@
       clickLink("logout");
    }
 
-   public void testDefaultTheme() {
+   public void testDefaultTheme()
+   {
       beginAt("/index.html");
-      clickLink("standardlogin"); 
+      clickLink("standardlogin");
       setFormElement("j_username", "admin");
       setFormElement("j_password", "admin");
       submit();
@@ -82,7 +85,7 @@
       assertLinkPresent("standardlogin");
    }
 
-   public void testDeletedTheme() 
+   public void testDeletedTheme()
    {
       // initialize your database connection here
       IDatabaseConnection connection = null;
@@ -93,7 +96,7 @@
          // initialize your dataset here
          IDataSet dataSet = Utils.getDataSet("resources/test/theme.xml");
          DatabaseOperation.UPDATE.execute(connection, dataSet);
-       
+
       }
       catch (Exception dbe)
       {
@@ -114,7 +117,7 @@
          }
       }
       beginAt("/index.html");
-      clickLink("standardlogin"); 
+      clickLink("standardlogin");
       setFormElement("j_username", "user");
       setFormElement("j_password", "user");
       submit();
@@ -127,9 +130,10 @@
       assertLinkPresent("standardlogin");
    }
 
-   public void testResetTheme() {
+   public void testResetTheme()
+   {
       beginAt("/index.html");
-      clickLink("standardlogin"); 
+      clickLink("standardlogin");
       setFormElement("j_username", "user");
       setFormElement("j_password", "user");
       submit();

Modified: trunk/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/theme/strategy/StrategyFactoryTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.theme.strategy;
 
 import junit.framework.Test;
@@ -26,33 +27,26 @@
 import junit.framework.TestSuite;
 
 
-/**
- * Typically you will have one of these classes for every
- * class in the package you want to test named ClassNameTest
- */
+/** Typically you will have one of these classes for every class in the package you want to test named ClassNameTest */
 public class StrategyFactoryTest extends TestCase
 {
 
 
-   /**
-    * Creates the test with a given name.
-    */
+   /** Creates the test with a given name. */
    public StrategyFactoryTest(String testName)
    {
       super(testName);
    }
 
-   /**
-    * Static method used to lauch this suite of tests.
-    */
+   /** Static method used to lauch this suite of tests. */
    public static Test suite()
    {
       return new TestSuite(StrategyFactoryTest.class);
    }
 
    /**
-    * Put and initialization code here. Gets called for every test
-    * in this suite class (so before every testMethod gets called.
+    * Put and initialization code here. Gets called for every test in this suite class (so before every testMethod gets
+    * called.
     */
    public void setUp()
    {
@@ -60,8 +54,8 @@
    }
 
    /**
-    * Put and clean up code here. Gets called for every test
-    * in this suite class (so after every testMethod gets called.
+    * Put and clean up code here. Gets called for every test in this suite class (so after every testMethod gets
+    * called.
     */
    public void tearDown()
    {
@@ -69,11 +63,8 @@
 
 
    /**
-    * This is an example testMethod. Any method
-    * named testXXX that takes no args and returns
-    * void will be called by the testing framework.
-    * Typically, you would have one of these for every
-    * method you wanted to test on your class.
+    * This is an example testMethod. Any method named testXXX that takes no args and returns void will be called by the
+    * testing framework. Typically, you would have one of these for every method you wanted to test on your class.
     */
    public void testSomeMethod()
    {

Modified: trunk/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portal/test/core/util/ParametersTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.core.util;
 
-import java.util.HashMap;
-
 import junit.framework.TestCase;
-
 import org.jboss.portlet.util.Parameters;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a>
- * $Revision$
- */
+import java.util.HashMap;
+
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class ParametersTestCase
-      extends TestCase
+   extends TestCase
 {
 
    private Parameters params;
@@ -84,28 +81,28 @@
    public void setUp()
    {
       HashMap map = new HashMap();
-      map.put("booltrue01", new String[] { booltrue01 });
-      map.put("booltrue02", new String[] { booltrue02 });
-      map.put("booltrue03", new String[] { booltrue03 });
-      map.put("boolfalse01", new String[] { boolfalse01 });
-      map.put("boolfalse02", new String[] { boolfalse02 });
-      map.put("boolfalse03", new String[] { boolfalse03 });
-      map.put("int01", new String[] { int01 });
-      map.put("int02", new String[] { int02 });
-      map.put("int03", new String[] { int03 });
-      map.put("float01", new String[] { float01 });
-      map.put("float02", new String[] { float02 });
-      map.put("float03", new String[] { float03 });
-      map.put("float04", new String[] { float04 });
-      map.put("double01", new String[] { double01 });
-      map.put("double02", new String[] { double02 });
-      map.put("double03", new String[] { double03 });
-      map.put("double04", new String[] { double04 });
-      map.put("string01", new String[] { string01 });
-      map.put("string02", new String[] { string02 });
-      map.put("long01", new String[] { long01 });
-      map.put("stringEmpty", new String[] { stringEmpty });
-      map.put("stringNull", new String[] { stringNull });
+      map.put("booltrue01", new String[]{booltrue01});
+      map.put("booltrue02", new String[]{booltrue02});
+      map.put("booltrue03", new String[]{booltrue03});
+      map.put("boolfalse01", new String[]{boolfalse01});
+      map.put("boolfalse02", new String[]{boolfalse02});
+      map.put("boolfalse03", new String[]{boolfalse03});
+      map.put("int01", new String[]{int01});
+      map.put("int02", new String[]{int02});
+      map.put("int03", new String[]{int03});
+      map.put("float01", new String[]{float01});
+      map.put("float02", new String[]{float02});
+      map.put("float03", new String[]{float03});
+      map.put("float04", new String[]{float04});
+      map.put("double01", new String[]{double01});
+      map.put("double02", new String[]{double02});
+      map.put("double03", new String[]{double03});
+      map.put("double04", new String[]{double04});
+      map.put("string01", new String[]{string01});
+      map.put("string02", new String[]{string02});
+      map.put("long01", new String[]{long01});
+      map.put("stringEmpty", new String[]{stringEmpty});
+      map.put("stringNull", new String[]{stringNull});
 
       params = new Parameters(map);
    }
@@ -582,86 +579,86 @@
 
    public void testGetShort01()
    {
-      short value = params.getShort("int01", (short) 9);
+      short value = params.getShort("int01", (short)9);
       assertEquals(10, value);
    }
 
    public void testGetShort02()
    {
-      short value = params.getShort("int01", (short) 9);
+      short value = params.getShort("int01", (short)9);
       assertEquals(10, value);
    }
 
    public void testGetShort03()
    {
-      short value = params.getShort("int01", (short) 9);
+      short value = params.getShort("int01", (short)9);
       assertEquals(10, value);
    }
 
    public void testGetShort04()
    {
-      short value = params.getShort("float01", (short) 9);
+      short value = params.getShort("float01", (short)9);
       assertEquals(9, value);
    }
 
    public void testGetShort05()
    {
-      short value = params.getShort(null, (short) 9);
+      short value = params.getShort(null, (short)9);
       assertEquals(9, value);
    }
 
    public void testGetShort06()
    {
-      short value = params.getShort("stringEmpty", (short) 9);
+      short value = params.getShort("stringEmpty", (short)9);
       assertEquals(9, value);
    }
 
    public void testGetShort07()
    {
-      short value = params.getShort("stringNull", (short) 9);
+      short value = params.getShort("stringNull", (short)9);
       assertEquals(9, value);
    }
 
    public void testGetShortObject01()
    {
-      Short value = params.getShortObject("int01", (short) 9);
-      assertEquals(new Short((short) 10), value);
+      Short value = params.getShortObject("int01", (short)9);
+      assertEquals(new Short((short)10), value);
    }
 
    public void testGetShortObject02()
    {
-      Short value = params.getShortObject("int01", (short) 9);
-      assertEquals(new Short((short) 10), value);
+      Short value = params.getShortObject("int01", (short)9);
+      assertEquals(new Short((short)10), value);
    }
 
    public void testGetShortObject03()
    {
-      Short value = params.getShortObject("int01", (short) 9);
-      assertEquals(new Short((short) 10), value);
+      Short value = params.getShortObject("int01", (short)9);
+      assertEquals(new Short((short)10), value);
    }
 
    public void testGetShortObject04()
    {
-      Short value = params.getShortObject("float01", (short) 9);
-      assertEquals(new Short((short) 9), value);
+      Short value = params.getShortObject("float01", (short)9);
+      assertEquals(new Short((short)9), value);
    }
 
    public void testGetShortObject05()
    {
-      Short value = params.getShortObject(null, (short) 9);
-      assertEquals(new Short((short) 9), value);
+      Short value = params.getShortObject(null, (short)9);
+      assertEquals(new Short((short)9), value);
    }
 
    public void testGetShortObject06()
    {
-      Short value = params.getShortObject("stringEmpty", (short) 9);
-      assertEquals(new Short((short) 9), value);
+      Short value = params.getShortObject("stringEmpty", (short)9);
+      assertEquals(new Short((short)9), value);
    }
 
    public void testGetShortObject07()
    {
-      Short value = params.getShortObject("stringNull", (short) 9);
-      assertEquals(new Short((short) 9), value);
+      Short value = params.getShortObject("stringNull", (short)9);
+      assertEquals(new Short((short)9), value);
    }
 
    public void testGetLong01()

Modified: trunk/core/src/main/org/jboss/portlet/JBossAPIFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossAPIFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossAPIFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
+import org.jboss.portal.portlet.impl.jsr168.APIFactory;
 import org.jboss.portal.portlet.impl.jsr168.ActionRequestImpl;
 import org.jboss.portal.portlet.impl.jsr168.ActionResponseImpl;
 import org.jboss.portal.portlet.impl.jsr168.RenderRequestImpl;
 import org.jboss.portal.portlet.impl.jsr168.RenderResponseImpl;
-import org.jboss.portal.portlet.impl.jsr168.APIFactory;
 import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
 

Modified: trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossActionRequest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
-import java.util.Map;
-
-import javax.portlet.PortletPreferences;
-
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.core.aspects.controller.node.Navigation;
 import org.jboss.portal.core.controller.portlet.ControllerUserContext;
-import org.jboss.portlet.util.Parameters;
+import org.jboss.portal.identity.User;
 import org.jboss.portal.portlet.impl.jsr168.ActionRequestImpl;
 import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portlet.util.Parameters;
 
+import javax.portlet.PortletPreferences;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -54,17 +54,13 @@
       return Navigation.getCurrentNode();
    }
 
-   /**
-    * Returns a modifiable map of user informations or null if the user is not authenticated.
-    */
+   /** Returns a modifiable map of user informations or null if the user is not authenticated. */
    public Map getInformations()
    {
       return userContext.getInformations();
    }
 
-   /**
-    * Returns the current authenticated user or null if the user is not authenticated
-    */
+   /** Returns the current authenticated user or null if the user is not authenticated */
    public User getUser()
    {
       if (userContext instanceof ControllerUserContext)

Modified: trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossActionResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
+import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.portal.common.util.URLTools;
 import org.jboss.portal.core.aspects.controller.node.PortalNodeURLFactory;
 import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
 import org.jboss.portal.core.controller.portlet.SignOutResponse;
-import org.jboss.portal.api.node.PortalNode;
-import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.portal.portlet.impl.jsr168.ActionResponseImpl;
 import org.jboss.portal.portlet.impl.jsr168.PortletRequestImpl;
 import org.jboss.portal.portlet.invocation.ActionInvocation;

Modified: trunk/core/src/main/org/jboss/portlet/JBossPortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
 import org.jboss.portal.format.util.EntityTable;
 
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.Iterator;
-import java.util.Map;
-
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
@@ -41,12 +31,22 @@
 import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
 import javax.portlet.PortletMode;
+import javax.portlet.PortletPreferences;
 import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 import javax.portlet.WindowState;
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
 
 /**
  * The JBossPortlet.
@@ -57,26 +57,22 @@
 public class JBossPortlet implements Portlet
 {
 
-   private static final Class[] ACTION_LOOKUP = new Class[]{JBossActionRequest.class,JBossActionResponse.class};
+   private static final Class[] ACTION_LOOKUP = new Class[]{JBossActionRequest.class, JBossActionResponse.class};
 
-   /** .*/
+   /** . */
    private PortletConfig config;
 
    public JBossPortlet()
    {
    }
 
-   /**
-    * Return the string <i>main</i>, it can be overriden to return another value by subclasses.
-    */
+   /** Return the string <i>main</i>, it can be overriden to return another value by subclasses. */
    public String getDefaultOperation()
    {
       return "main";
    }
 
-   /**
-    * Return the string <i>op</i>, it can be overriden to return another value by subclasses.
-    */
+   /** Return the string <i>op</i>, it can be overriden to return another value by subclasses. */
    public String getOperationName()
    {
       return "op";
@@ -101,30 +97,26 @@
       return config.getPortletContext();
    }
 
-   /**
-    * Calls <code>doDispatch(JBossActionRequest,JBossActionResponse)</code>.
-    */
+   /** Calls <code>doDispatch(JBossActionRequest,JBossActionResponse)</code>. */
    protected void processAction(JBossActionRequest req, JBossActionResponse resp) throws PortletException, PortletSecurityException, IOException
    {
       processDispatch(req, resp);
    }
 
    /**
-    * <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>
-    *
-    * <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>
-    *
-    * <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 <code>PortletException</code> is created with the caught exception as cause and thrown</li>
-    * </ul>
+    * <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>
+    * <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
+    * <code>PortletException</code> is created with the caught exception as cause and thrown</li> </ul>
     */
    protected void processDispatch(JBossActionRequest req, JBossActionResponse resp) throws PortletException, PortletSecurityException, IOException
    {
@@ -143,14 +135,12 @@
       }
    }
 
-   /**
-    * Default doEdit method that works in coordination with doEdit(JBossRenderRequest,JBossRenderResponse).
-    */
+   /** Default doEdit method that works in coordination with doEdit(JBossRenderRequest,JBossRenderResponse). */
    public void processEdit(JBossActionRequest req, JBossActionResponse resp) throws PortletException, PortletSecurityException, IOException
    {
       PortletPreferences prefs = req.getPreferences();
       Map map = prefs.getMap();
-      for (Iterator i = req.getParameterMap().entrySet().iterator();i.hasNext();)
+      for (Iterator i = req.getParameterMap().entrySet().iterator(); i.hasNext();)
       {
          Map.Entry entry = (Map.Entry)i.next();
          String name = (String)entry.getKey();
@@ -195,7 +185,7 @@
       {
          try
          {
-            dispatcher.invoke(this, new Object[]{req,resp});
+            dispatcher.invoke(this, new Object[]{req, resp});
          }
          catch (IllegalAccessException e)
          {
@@ -206,19 +196,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
             {
@@ -232,9 +222,7 @@
       }
    }
 
-   /**
-    * Calls <code>doDispatch(JBossRenderRequest,JBossRenderResponse)</code>.
-    */
+   /** Calls <code>doDispatch(JBossRenderRequest,JBossRenderResponse)</code>. */
    protected void render(JBossRenderRequest req, JBossRenderResponse resp) throws PortletException, PortletSecurityException, IOException
    {
       resp.setTitle(getTitle(req));
@@ -264,25 +252,19 @@
       }
    }
 
-   /**
-    * Throw a <code>PortletException</code>.
-    */
+   /** Throw a <code>PortletException</code>. */
    protected void doView(JBossRenderRequest request, JBossRenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
       throw new PortletException();
    }
 
-   /**
-    * Throw a <code>PortletException</code>.
-    */
+   /** Throw a <code>PortletException</code>. */
    protected void doHelp(JBossRenderRequest request, JBossRenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
       throw new PortletException();
    }
 
-   /**
-    * Provide a default generic editor for preferences that produce HTML markup.
-    */
+   /** Provide a default generic editor for preferences that produce HTML markup. */
    protected void doEdit(JBossRenderRequest request, JBossRenderResponse response) throws PortletException, PortletSecurityException, IOException
    {
       response.setContentType("text/html");
@@ -303,7 +285,7 @@
 
       //
       PortletPreferences prefs = request.getPreferences();
-      for (Iterator i = prefs.getMap().entrySet().iterator();i.hasNext();)
+      for (Iterator i = prefs.getMap().entrySet().iterator(); i.hasNext();)
       {
          Map.Entry entry = (Map.Entry)i.next();
          String name = (String)entry.getKey();
@@ -376,7 +358,7 @@
 
    public void processAction(ActionRequest request, ActionResponse response) throws PortletException, PortletSecurityException, IOException
    {
-      processAction((JBossActionRequest)request,(JBossActionResponse)response);
+      processAction((JBossActionRequest)request, (JBossActionResponse)response);
    }
 
    public void render(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException
@@ -390,16 +372,14 @@
 
    // Private **********************************************************************************************************
 
-   /**
-    * Locate a method.
-    */
+   /** Locate a method. */
    private Method lookupMethod(String operation, Class[] parameterTypes)
    {
       try
       {
          Method m = getClass().getMethod(operation, parameterTypes);
          if (m.getReturnType() == void.class &&
-             Modifier.isPublic(m.getModifiers()))
+            Modifier.isPublic(m.getModifiers()))
          {
             return m;
          }

Modified: trunk/core/src/main/org/jboss/portlet/JBossPortletPreferences.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossPortletPreferences.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossPortletPreferences.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
+import org.jboss.portal.common.util.ProxyInfo;
+import org.jboss.portal.portlet.impl.jsr168.PortletPreferencesImpl;
+import org.jboss.portal.portlet.state.PropertyContext;
+
+import javax.portlet.PreferencesValidator;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import javax.portlet.PreferencesValidator;
-
-import org.jboss.portal.common.util.ProxyInfo;
-import org.jboss.portal.portlet.impl.jsr168.PortletPreferencesImpl;
-import org.jboss.portal.portlet.state.PropertyContext;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -43,10 +43,10 @@
    private ProxyInfo proxyInfo;
 
    public JBossPortletPreferences(
-         PropertyContext manager,
-         PreferencesValidator validator,
-         int mode,
-         ProxyInfo proxyInfo)
+      PropertyContext manager,
+      PreferencesValidator validator,
+      int mode,
+      ProxyInfo proxyInfo)
    {
       super(manager, validator, mode);
       this.proxyInfo = proxyInfo;

Modified: trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossRenderRequest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,44 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
-import java.util.Map;
-
-import javax.portlet.PortletPreferences;
-
+import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.core.aspects.controller.node.Navigation;
 import org.jboss.portal.core.controller.portlet.ControllerUserContext;
-import org.jboss.portlet.util.Parameters;
+import org.jboss.portal.identity.User;
 import org.jboss.portal.portlet.impl.jsr168.RenderRequestImpl;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portlet.util.Parameters;
 
+import javax.portlet.PortletPreferences;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet </a>
  * @version $Revision$
  */
 public class JBossRenderRequest
-      extends RenderRequestImpl
+   extends RenderRequestImpl
 {
 
    /** The parameters. */
@@ -62,17 +62,13 @@
       return Navigation.getCurrentNode();
    }
 
-   /**
-    * Returns a modifiable map of user informations or null if the user is not authenticated.
-    */
+   /** Returns a modifiable map of user informations or null if the user is not authenticated. */
    public Map getInformations()
    {
       return userContext.getInformations();
    }
 
-   /**
-    * Returns the current authenticated user or null if the user is not authenticated
-    */
+   /** Returns the current authenticated user or null if the user is not authenticated */
    public User getUser()
    {
       if (userContext instanceof ControllerUserContext)

Modified: trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/JBossRenderResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet;
 
-import org.jboss.portal.portlet.impl.jsr168.RenderResponseImpl;
-import org.jboss.portal.portlet.impl.jsr168.PortletRequestImpl;
-import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.api.node.PortalNodeURL;
 import org.jboss.portal.core.aspects.controller.node.PortalNodeURLFactory;
 import org.jboss.portal.core.aspects.controller.node.PortalObjectNode;
-import org.jboss.portal.api.node.PortalNodeURL;
-import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.portlet.impl.jsr168.PortletRequestImpl;
+import org.jboss.portal.portlet.impl.jsr168.RenderResponseImpl;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -66,9 +67,7 @@
       }
    }
 
-   /**
-    * @deprecated
-    */
+   /** @deprecated  */
    public PortletInvocation getInvocation()
    {
       return invocation;

Modified: trunk/core/src/main/org/jboss/portlet/session/PortletSessionListener.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/session/PortletSessionListener.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/session/PortletSessionListener.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.session;
 
 import org.jboss.portal.portlet.session.SessionListener;

Modified: trunk/core/src/main/org/jboss/portlet/util/Parameters.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/util/Parameters.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/main/org/jboss/portlet/util/Parameters.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.util;
 
 import java.util.Map;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$
- */
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class Parameters
 {
 
    private Map parameters;
 
-   /**
-    * @param parameterMap
-    */
+   /** @param parameterMap  */
    public Parameters(Map parameterMap)
    {
       this.parameters = parameterMap;
@@ -45,7 +42,7 @@
       {
          return null;
       }
-      String[] value = (String[]) parameters.get(name);
+      String[] value = (String[])parameters.get(name);
       return value == null ? null : value[0];
    }
 
@@ -64,13 +61,11 @@
 
    /**
     * Returns the value as a boolean
-    * 
-    * @param key
-    *           Key of the parameter
-    * @param def
-    *           Default value if value is different from true or false
-    * @return boolean value for the string "true" or "false" (not sensitive to
-    *         uppercase/lowercase, and leading/trailing spaces).
+    *
+    * @param key Key of the parameter
+    * @param def Default value if value is different from true or false
+    * @return boolean value for the string "true" or "false" (not sensitive to uppercase/lowercase, and leading/trailing
+    *         spaces).
     */
    public boolean getBoolean(String key, boolean def)
    {

Modified: trunk/core/src/resources/dtd/jboss-app_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/jboss-app_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/jboss-app_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!--
 <!DOCTYPE jboss-web PUBLIC
    "-//JBoss Portal//DTD JBoss Web Application 2.0//EN"

Modified: trunk/core/src/resources/dtd/jboss-portlet_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/jboss-portlet_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/jboss-portlet_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!--
 <!DOCTYPE jboss-web PUBLIC
    "-//JBoss Portal//DTD JBoss Portlet 2.0//EN"

Modified: trunk/core/src/resources/dtd/portal-layouts_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/portal-layouts_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/portal-layouts_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -13,4 +13,27 @@
 <!ELEMENT decoration-renderer (#PCDATA)>
 <!ELEMENT portlet-renderer (#PCDATA)>
 <!ELEMENT region-renderer (#PCDATA)>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!ELEMENT window-renderer (#PCDATA)>

Modified: trunk/core/src/resources/dtd/portal-renderSet_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/portal-renderSet_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/portal-renderSet_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -7,4 +7,27 @@
 <!ELEMENT decoration-renderer (#PCDATA)>
 <!ELEMENT portlet-renderer (#PCDATA)>
 <!ELEMENT region-renderer (#PCDATA)>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!ELEMENT window-renderer (#PCDATA)>

Modified: trunk/core/src/resources/dtd/portal-strategies_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/portal-strategies_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/portal-strategies_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -4,4 +4,27 @@
 <!ATTLIST set name CDATA #REQUIRED>
 <!ELEMENT strategy (implementation)>
 <!ATTLIST strategy content-type CDATA #REQUIRED>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!ELEMENT implementation (#PCDATA)>

Modified: trunk/core/src/resources/dtd/portal-themes_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/portal-themes_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/portal-themes_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -9,5 +9,28 @@
 href CDATA #REQUIRED
 title CDATA #IMPLIED
 media CDATA #IMPLIED>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!ELEMENT script (#PCDATA)>
 <!ATTLIST script href CDATA #REQUIRED>

Modified: trunk/core/src/resources/dtd/portal_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/portal_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/portal_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!--
 <!DOCTYPE jboss-web PUBLIC
    "-//JBoss Portal//DTD Portal 2.0//EN"

Modified: trunk/core/src/resources/dtd/portlet-instances_2_0.dtd
===================================================================
--- trunk/core/src/resources/dtd/portlet-instances_2_0.dtd	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/dtd/portlet-instances_2_0.dtd	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!--
 <!DOCTYPE jboss-web PUBLIC
    "-//JBoss Portal//DTD Portlet Instances 2.0//EN"

Modified: trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-cms-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
-<server> 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<server>
 	<mbean
       code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
       name="portal:service=Hibernate,type=CMS"
@@ -81,7 +104,7 @@
                   <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                   <param name="externalBLOBs" value="false"/>
                </PersistenceManager>
-               
+
                <!-- XMLPersistenceManager: uses FileSystem for storage -->
                <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
 
@@ -109,7 +132,7 @@
                   <param name="schemaObjectPrefix" value="VersionEntry"/>
                   <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                </FileSystem>
-               
+
                <!-- LocalFileSystem: uses FileSystem for storage. -->
                <!--
                <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
@@ -128,7 +151,7 @@
                   <param name="JNDIName" value="java:portal/cms/CMSSessionFactory"/>
                   <param name="externalBLOBs" value="false"/>
                </PersistenceManager>
-               
+
                <!-- XMLPersistenceManager: uses FileSystem for storage -->
                <!--<PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager"/>-->
             </Versioning>
@@ -212,153 +235,152 @@
       <attribute name="Path">/content</attribute>
       <depends optional-attribute-name="Factory" proxy-type="attribute">portal:urlFactory=Delegating</depends>
    </mbean>
-   
+
    <!-- TreeCache configuration used to cache CMS data -->
    <mbean code="org.jboss.cache.TreeCache"
-           name="cms.pm.cache:service=TreeCache">
+          name="cms.pm.cache:service=TreeCache">
    
            <depends>jboss:service=Naming</depends>
            <depends>jboss:service=TransactionManager</depends>
            <depends>portal:service=Hibernate,type=CMS</depends>
            <depends>portal:service=CMS</depends>
-   
-           <!--
-           Configure the TransactionManager
-           -->
-           <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-           
-           <!--
-		Node locking scheme:
-		OPTIMISTIC
-		PESSIMISTIC (default)
-		using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
-	   -->
-	   <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
-   
-           <!--
-               Isolation level : SERIALIZABLE
-                                 REPEATABLE_READ (default)
-                                 READ_COMMITTED
-                                 READ_UNCOMMITTED
-                                 NONE
-           -->
-           <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-           
-           	   
-   
-           <!--
-                Valid modes are LOCAL
-                                REPL_ASYNC
-                                REPL_SYNC
-                                INVALIDATION_ASYNC
-                                INVALIDATION_SYNC
-           -->
-           <!-- in a non-HA environment with the Jackrabbit cluster is activated -->
-           <!--attribute name="CacheMode">INVALIDATION_ASYNC</attribute-->           
-           <!-- in a HA environment since there is only a singleton node for CMS, this can be local -->
-           <attribute name="CacheMode">LOCAL</attribute>           
-   
-           <!--
-           Just used for async repl: use a replication queue
-           -->
-           <attribute name="UseReplQueue">false</attribute>
-   
-           <!--
-               Replication interval for replication queue (in ms)
-           -->
-           <attribute name="ReplQueueInterval">0</attribute>
-   
-           <!--
-               Max number of elements which trigger replication
-           -->
-           <attribute name="ReplQueueMaxElements">0</attribute>
-   
-           <!-- Name of cluster. Needs to be the same for all clusters, in order
-                to find each other
-           -->
-           <attribute name="ClusterName">JCRPMCache</attribute>
-   
-           <!-- JGroups protocol stack properties. Can also be a URL,
-                e.g. file:/home/bela/default.xml
-              <attribute name="ClusterProperties"></attribute>
-           -->
-   
-           <attribute name="ClusterConfig">
+
+      <!--
+      Configure the TransactionManager
+      -->
+      <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+      <!--
+        Node locking scheme:
+        OPTIMISTIC
+        PESSIMISTIC (default)
+        using the OPTIMISTIC scheme, the ISOLATION_LEVEL value is ignored
+        -->
+      <!--attribute name="NodeLockingScheme">OPTIMISTIC</attribute-->
+
+      <!--
+          Isolation level : SERIALIZABLE
+                            REPEATABLE_READ (default)
+                            READ_COMMITTED
+                            READ_UNCOMMITTED
+                            NONE
+      -->
+      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
+
+
+      <!--
+           Valid modes are LOCAL
+                           REPL_ASYNC
+                           REPL_SYNC
+                           INVALIDATION_ASYNC
+                           INVALIDATION_SYNC
+      -->
+      <!-- in a non-HA environment with the Jackrabbit cluster is activated -->
+      <!--attribute name="CacheMode">INVALIDATION_ASYNC</attribute-->
+      <!-- in a HA environment since there is only a singleton node for CMS, this can be local -->
+      <attribute name="CacheMode">LOCAL</attribute>
+
+      <!--
+      Just used for async repl: use a replication queue
+      -->
+      <attribute name="UseReplQueue">false</attribute>
+
+      <!--
+          Replication interval for replication queue (in ms)
+      -->
+      <attribute name="ReplQueueInterval">0</attribute>
+
+      <!--
+          Max number of elements which trigger replication
+      -->
+      <attribute name="ReplQueueMaxElements">0</attribute>
+
+      <!-- Name of cluster. Needs to be the same for all clusters, in order
+           to find each other
+      -->
+      <attribute name="ClusterName">JCRPMCache</attribute>
+
+      <!-- JGroups protocol stack properties. Can also be a URL,
+           e.g. file:/home/bela/default.xml
+         <attribute name="ClusterProperties"></attribute>
+      -->
+
+      <attribute name="ClusterConfig">
                <config>
                    <!-- UDP: if you have a multihomed machine,
                    set the bind_addr attribute to the appropriate NIC IP address -->
-                   <!-- UDP: On Windows machines, because of the media sense feature
-                    being broken with multicast (even after disabling media sense)
-                    set the loopback attribute to true -->
-                   <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-                       ip_ttl="64" ip_mcast="true" 
+                  <!-- UDP: On Windows machines, because of the media sense feature
+            being broken with multicast (even after disabling media sense)
+            set the loopback attribute to true -->
+                  <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+                       ip_ttl="64" ip_mcast="true"
                        receive_on_all_interfaces="true"
                        mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
                        ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
                        loopback="false"/>
                    <PING timeout="2000" num_initial_members="3"
-                       up_thread="false" down_thread="false"/>
+                         up_thread="false" down_thread="false"/>
                    <MERGE2 min_interval="10000" max_interval="20000"/>
-                   <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
-                   <FD_SOCK/>
+                  <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
+                  <FD_SOCK/>
                    <VERIFY_SUSPECT timeout="1500"
-                       up_thread="false" down_thread="false"/>
+                                   up_thread="false" down_thread="false"/>
                    <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-                       max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                                  max_xmit_size="8192" up_thread="false" down_thread="false"/>
                    <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-                       down_thread="false"/>
+                            down_thread="false"/>
                    <pbcast.STABLE desired_avg_gossip="20000"
-                       up_thread="false" down_thread="false"/>
+                                  up_thread="false" down_thread="false"/>
                    <FRAG frag_size="8192"
-                       down_thread="false" up_thread="false"/>
+                         down_thread="false" up_thread="false"/>
                    <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-                       shun="true" print_local_addr="true"/>
+                               shun="true" print_local_addr="true"/>
                    <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
                </config>
            </attribute>
-   
-           <!--
-            Whether or not to fetch state on joining a cluster
-            NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
-            
-            Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA 
-           -->
-           <!--attribute name="FetchInMemoryState">false</attribute-->
-   
-           <!--
-               The max amount of time (in milliseconds) we wait until the
-               initial state (ie. the contents of the cache) are retrieved from
-               existing members in a clustered environment
-           -->
-           <attribute name="InitialStateRetrievalTimeout">20000</attribute>
-   
-           <!--
-               Number of milliseconds to wait until all responses for a
-               synchronous call have been received.
-           -->
-           <attribute name="SyncReplTimeout">20000</attribute>
-   
-           <!-- Max number of milliseconds to wait for a lock acquisition -->
-           <attribute name="LockAcquisitionTimeout">15000</attribute>
-   
-   
-           <!-- Name of the eviction policy class. -->
-           <attribute name="EvictionPolicyClass"></attribute>
-          
-          <!--
-             Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
-             class loader, e.g., inside an application server. Default is "false".
-             
-             Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA 
-          -->
-           <!--attribute name="UseRegionBasedMarshalling">false</attribute-->
-           
-           <!--
-           		Configuring the PortalCMSCacheLoader
-           		
-           		CacheLoader configuratoon for 1.4.0
-           -->           
-           <attribute name="CacheLoaderConfiguration">
+
+      <!--
+       Whether or not to fetch state on joining a cluster
+       NOTE this used to be called FetchStateOnStartup and has been renamed to be more descriptive.
+
+       Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+      -->
+      <!--attribute name="FetchInMemoryState">false</attribute-->
+
+      <!--
+          The max amount of time (in milliseconds) we wait until the
+          initial state (ie. the contents of the cache) are retrieved from
+          existing members in a clustered environment
+      -->
+      <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+      <!--
+          Number of milliseconds to wait until all responses for a
+          synchronous call have been received.
+      -->
+      <attribute name="SyncReplTimeout">20000</attribute>
+
+      <!-- Max number of milliseconds to wait for a lock acquisition -->
+      <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+      <!-- Name of the eviction policy class. -->
+      <attribute name="EvictionPolicyClass"></attribute>
+
+      <!--
+         Indicate whether to use region based marshalling or not. Set this to true if you are running under a scoped
+         class loader, e.g., inside an application server. Default is "false".
+
+         Not supported in version 1.2.4SP2 which is what ships by default in 4.0.4GA
+      -->
+      <!--attribute name="UseRegionBasedMarshalling">false</attribute-->
+
+      <!--
+            Configuring the PortalCMSCacheLoader
+
+            CacheLoader configuratoon for 1.4.0
+      -->
+      <attribute name="CacheLoaderConfiguration">
                <config>                
                    <passivation>false</passivation>
                    <preload></preload>
@@ -372,107 +394,107 @@
                    </cacheloader>
                </config>
            </attribute>
-           <!--
-           		Configuring the PortalCMSCacheLoader
-           		
-           		CacheLoader configuratoon for 1.2.4SP2
-           --> 
-           <!--attribute name="CacheLoaderClass">org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</attribute>       
-           <attribute name="CacheLoaderConfig" replace="false"></attribute>
-           <attribute name="CacheLoaderPassivation">false</attribute>
-           <attribute name="CacheLoaderPreload"></attribute>
-           <attribute name="CacheLoaderShared">false</attribute>           
-           <attribute name="CacheLoaderFetchTransientState">false</attribute>
-           <attribute name="CacheLoaderFetchPersistentState">false</attribute>
-           <attribute name="CacheLoaderAsynchronous">false</attribute-->          
+      <!--
+            Configuring the PortalCMSCacheLoader
+
+            CacheLoader configuratoon for 1.2.4SP2
+      -->
+      <!--attribute name="CacheLoaderClass">org.jboss.portal.cms.hibernate.state.PortalCMSCacheLoader</attribute>
+     <attribute name="CacheLoaderConfig" replace="false"></attribute>
+     <attribute name="CacheLoaderPassivation">false</attribute>
+     <attribute name="CacheLoaderPreload"></attribute>
+     <attribute name="CacheLoaderShared">false</attribute>
+     <attribute name="CacheLoaderFetchTransientState">false</attribute>
+     <attribute name="CacheLoaderFetchPersistentState">false</attribute>
+     <attribute name="CacheLoaderAsynchronous">false</attribute-->
     </mbean>
-   
+
    <!--
-   	| Uncomment in clustered mode : TreeCache configuration for the clustered JackRabbit in-memory cache...
-   	| This helps with node synching, but there are other aspects of JackRabbit like versioning subsystem
-   	| and locking system that get out-of-sync in the cluster. This leads to unpredicatable results and hence
-   	| the idea to cluster JackRabbit needs to be dropped at this time
-   -->   	
+      | Uncomment in clustered mode : TreeCache configuration for the clustered JackRabbit in-memory cache...
+      | This helps with node synching, but there are other aspects of JackRabbit like versioning subsystem
+      | and locking system that get out-of-sync in the cluster. This leads to unpredicatable results and hence
+      | the idea to cluster JackRabbit needs to be dropped at this time
+   -->
    <!--mbean code="org.jboss.cache.TreeCache"
-               name="jackrabbit.inmemory.cache:service=TreeCache">
-       
-           <depends>jboss:service=Naming</depends>
-	       <depends>jboss:service=TransactionManager</depends>
-	       
-	       <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
-	               	         
-	       
-	               
-	               <attribute name="IsolationLevel">NONE</attribute>
-	       
-	               
-	               <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
-	       
-	               
-	               <attribute name="UseReplQueue">false</attribute>
-	       
-	               
-	               <attribute name="ReplQueueInterval">0</attribute>
-	       
-	               
-	               <attribute name="ReplQueueMaxElements">0</attribute>
-	       
-	               
-	               <attribute name="ClusterName">JackRabbitInternalCache</attribute>
-	       
-	               
-	       
-	               <attribute name="ClusterConfig">
-	                   <config>	                       
-	                       <UDP mcast_addr="228.1.2.3" mcast_port="48866"
-	                           ip_ttl="64" ip_mcast="true" 
-	                           receive_on_all_interfaces="true"
-	                           mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
-	                           ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
-	                           loopback="false"/>                
-	                       <PING timeout="2000" num_initial_members="3"
-	                           up_thread="false" down_thread="false"/>
-	                       <MERGE2 min_interval="10000" max_interval="20000"/>	                       
-	                       <FD_SOCK/>
-	                       <VERIFY_SUSPECT timeout="1500"
-	                           up_thread="false" down_thread="false"/>
-	                       <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-	                           max_xmit_size="8192" up_thread="false" down_thread="false"/>
-	                       <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-	                           down_thread="false"/>
-	                       <pbcast.STABLE desired_avg_gossip="20000"
-	                           up_thread="false" down_thread="false"/>
-	                       <FRAG frag_size="8192"
-	                           down_thread="false" up_thread="false"/>
-	                       <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-	                           shun="true" print_local_addr="true"/>
-	                       <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
-	                   </config>
-	               </attribute>
-	       
-	               <attribute name="FetchInMemoryState">false</attribute>
-	       
-	               <attribute name="InitialStateRetrievalTimeout">20000</attribute>
-	       
-	               <attribute name="SyncReplTimeout">20000</attribute>
-	       	       
-	               <attribute name="LockAcquisitionTimeout">15000</attribute>
-	       
-	       	               
-	               <attribute name="EvictionPolicyClass"></attribute>
-	              	              
-        		  <attribute name="UseRegionBasedMarshalling">false</attribute>                        
-    </mbean-->
-    
-    
-    <!--mbean
+              name="jackrabbit.inmemory.cache:service=TreeCache">
+
+          <depends>jboss:service=Naming</depends>
+         <depends>jboss:service=TransactionManager</depends>
+
+         <attribute name="TransactionManagerLookupClass">org.jboss.cache.GenericTransactionManagerLookup</attribute>
+
+
+
+                 <attribute name="IsolationLevel">NONE</attribute>
+
+
+                 <attribute name="CacheMode">INVALIDATION_ASYNC</attribute>
+
+
+                 <attribute name="UseReplQueue">false</attribute>
+
+
+                 <attribute name="ReplQueueInterval">0</attribute>
+
+
+                 <attribute name="ReplQueueMaxElements">0</attribute>
+
+
+                 <attribute name="ClusterName">JackRabbitInternalCache</attribute>
+
+
+
+                 <attribute name="ClusterConfig">
+                     <config>
+                         <UDP mcast_addr="228.1.2.3" mcast_port="48866"
+                             ip_ttl="64" ip_mcast="true"
+                             receive_on_all_interfaces="true"
+                             mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
+                             ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
+                             loopback="false"/>
+                         <PING timeout="2000" num_initial_members="3"
+                             up_thread="false" down_thread="false"/>
+                         <MERGE2 min_interval="10000" max_interval="20000"/>
+                         <FD_SOCK/>
+                         <VERIFY_SUSPECT timeout="1500"
+                             up_thread="false" down_thread="false"/>
+                         <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
+                             max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                         <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
+                             down_thread="false"/>
+                         <pbcast.STABLE desired_avg_gossip="20000"
+                             up_thread="false" down_thread="false"/>
+                         <FRAG frag_size="8192"
+                             down_thread="false" up_thread="false"/>
+                         <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
+                             shun="true" print_local_addr="true"/>
+                         <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
+                     </config>
+                 </attribute>
+
+                 <attribute name="FetchInMemoryState">false</attribute>
+
+                 <attribute name="InitialStateRetrievalTimeout">20000</attribute>
+
+                 <attribute name="SyncReplTimeout">20000</attribute>
+
+                 <attribute name="LockAcquisitionTimeout">15000</attribute>
+
+
+                 <attribute name="EvictionPolicyClass"></attribute>
+
+               <attribute name="UseRegionBasedMarshalling">false</attribute>
+   </mbean-->
+
+
+   <!--mbean
       code="org.jboss.portal.cms.impl.interceptors.LogInterceptor"
       name="portal:service=Interceptor,type=Cms,name=Log"
       xmbean-dd=""
       xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
       <xmbean/>
    </mbean-->
-   
+
    <!--
       //this is not needed anymore. this cache is redundant since there is a JBossCache PM      
    <mbean

Modified: trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml
===================================================================
--- trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,173 +1,196 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class name="org.jboss.portal.cms.hibernate.state.VersionBinVal" table="jbp_cms_version_binval" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="id"
-            column="BINVAL_ID"
-            type="string"
-            length="255"/>
+         name="id"
+         column="BINVAL_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="BINVAL_DATA"
-            type="blob"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="BINVAL_DATA"
+         type="blob"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionNode" table="jbp_cms_version_node" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="nodeId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="nodeId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="NODE_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="NODE_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionProp" table="jbp_cms_version_prop" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="propId"
-            column="PROP_ID"
-            type="string"
-            length="255"/>
+         name="propId"
+         column="PROP_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="PROP_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="PROP_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.VersionRefs" table="jbp_cms_version_refs" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="refId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="refId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="REFS_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="REFS_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPBinVal" table="jbp_cms_wsp_binval" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="id"
-            column="BINVAL_ID"
-            type="string"
-            length="255"/>
+         name="id"
+         column="BINVAL_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="BINVAL_DATA"
-            type="blob"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="BINVAL_DATA"
+         type="blob"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPNode" table="jbp_cms_wsp_node" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="nodeId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="nodeId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="NODE_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="NODE_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPProp" table="jbp_cms_wsp_prop" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="propId"
-            column="PROP_ID"
-            type="string"
-            length="255"/>
+         name="propId"
+         column="PROP_ID"
+         type="string"
+         length="255"/>
       <property
-            name="data"
-            column="PROP_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="PROP_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.state.WSPRefs" table="jbp_cms_wsp_refs" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="refId"
-            column="NODE_ID"
-            type="string"
-            length="36"/>
+         name="refId"
+         column="NODE_ID"
+         type="string"
+         length="36"/>
       <property
-            name="data"
-            column="REFS_DATA"
-            type="binary"
-            length="100000000"
-            not-null="true"/>
+         name="data"
+         column="REFS_DATA"
+         type="binary"
+         length="100000000"
+         not-null="true"/>
    </class>
    <class name="org.jboss.portal.cms.hibernate.CMSEntry" table="jbp_cms_cmsentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"
@@ -189,17 +212,17 @@
    </class>
    <class name="org.jboss.portal.cms.hibernate.RepositoryEntry" table="jbp_cms_repositoryentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"
@@ -221,17 +244,17 @@
    </class>
    <class name="org.jboss.portal.cms.hibernate.VersionEntry" table="jbp_cms_versionentry" lazy="true">
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Integer">
+         name="key"
+         column="PK"
+         type="java.lang.Integer">
          <generator class="native"/>
       </id>
       <property
-            name="name"
-            column="FSENTRY_NAME"
-            type="string"
-            length="255"
-            not-null="false"/>
+         name="name"
+         column="FSENTRY_NAME"
+         type="string"
+         length="255"
+         not-null="false"/>
       <property name="path"
                 column="FSENTRY_PATH"
                 type="string"

Modified: trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,15 +1,38 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+   "-//Hibernate/Hibernate Configuration DTD//EN"
+   "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
    <session-factory>
       <property name="connection.datasource">java:@portal.datasource.name@</property>
       <property name="show_sql">@portal.sql.show@</property>
       <property name="cache.use_second_level_cache">false</property>
       <property name="cache.use_query_cache">false</property>
-      
-      <!-- managed environment transaction configuration -->      
+
+      <!-- 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>
 

Modified: trunk/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-cms-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
 </jboss-web>

Modified: trunk/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-cms-war/WEB-INF/portlet-instances.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <instances>
 <!--
 -->
@@ -30,30 +53,30 @@
       <portlet-ref>samples.JSPPortlet</portlet-ref>
    </instance>
 -->
-<!--
-   <instance>
-      <instance-id>TestPortletInstance</instance-id>
-      <portlet-ref>TestPortlet</portlet-ref>
-   </instance>
-   <instance>
-      <instance-id>PreferencesPortletInstance</instance-id>
-      <portlet-ref>PreferencesPortlet</portlet-ref>
-      <preferences>
-         <preference>
-            <name>one</name>
-            <value>1.5</value>
-         </preference>
-         <preference>
-            <name>two</name>
-            <value>2.5</value>
-            <read-only>true</read-only>
-         </preference>
-         <preference>
-            <name>three</name>
-            <value>3.5</value>
-            <read-only>true</read-only>
-         </preference>
-      </preferences>
-   </instance>
--->
+   <!--
+      <instance>
+         <instance-id>TestPortletInstance</instance-id>
+         <portlet-ref>TestPortlet</portlet-ref>
+      </instance>
+      <instance>
+         <instance-id>PreferencesPortletInstance</instance-id>
+         <portlet-ref>PreferencesPortlet</portlet-ref>
+         <preferences>
+            <preference>
+               <name>one</name>
+               <value>1.5</value>
+            </preference>
+            <preference>
+               <name>two</name>
+               <value>2.5</value>
+               <read-only>true</read-only>
+            </preference>
+            <preference>
+               <name>three</name>
+               <value>3.5</value>
+               <read-only>true</read-only>
+            </preference>
+         </preferences>
+      </instance>
+   -->
 </instances>
\ No newline at end of file

Modified: trunk/core/src/resources/portal-cms-war/WEB-INF/web.xml
===================================================================
--- trunk/core/src/resources/portal-cms-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-cms-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
 </web-app>

Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server configuration service -->
@@ -429,7 +452,7 @@
       <attribute name="JNDIName">java:/portal/RoleModule</attribute>
       <attribute name="SessionFactoryJNDIName">java:/portal/UserSessionFactory</attribute>
    </mbean>
-   
+
    <!-- not needed -->
    <!--mbean
       code="org.jboss.portal.core.impl.mail.MailModuleImpl"
@@ -448,7 +471,7 @@
       <attribute name="SMTPTimeout">10000</attribute>
       <attribute name="JNDIName">java:portal/MailModule</attribute>
    </mbean-->
-   
+
    <mbean
       code="org.jboss.security.auth.login.DynamicLoginConfig"
       name="portal:service=JAASLoginModule">

Modified: trunk/core/src/resources/portal-core-sar/conf/bundles/Resource.properties
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/bundles/Resource.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/bundles/Resource.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 # Navigation Portlet
 PAGENAME_default=Home
 PAGENAME_Admin=Admin

Modified: trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 # Navigation Portlet
 PAGENAME_default=Home
 PAGENAME_Admin=Admin

Modified: trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 # Navigation Portlet
 PAGENAME_default=Home
 PAGENAME_Admin=Administración

Modified: trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 # Navigation Portlet
 PAGENAME_default=Accueil
 PAGENAME_Admin=Admin

Modified: trunk/core/src/resources/portal-core-sar/conf/config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
    <!-- When a window has restrictedaccess : show or hide values are permitted -->
    <entry key="core.render.window_access_denied">show</entry>

Modified: trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/data/default-object.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
       <parent-ref/>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,58 +1,81 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
-      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class
-         name="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
-         table="JBP_INSTANCE">
+      name="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
+      table="JBP_INSTANCE">
       <cache usage="@portal.hibernate.cache.usage@"/>
       <id
-            name="key"
-            column="PK"
-            access="field">
+         name="key"
+         column="PK"
+         access="field">
          <generator class="native">
             <param name="sequence">instance_seq</param>
          </generator>
       </id>
       <property
-            name="instanceId"
-            column="ID"
-            not-null="true"
-            unique="true"/>
+         name="instanceId"
+         column="ID"
+         not-null="true"
+         unique="true"/>
       <property
-            name="portletRef"
-            column="PORTLET_REF"
-            not-null="false"
-            unique="false"/>
+         name="portletRef"
+         column="PORTLET_REF"
+         not-null="false"
+         unique="false"/>
       <property
-            name="modifiable"
-            column="MODIFIABLE"
-            not-null="true"
-            unique="false"/>
+         name="modifiable"
+         column="MODIFIABLE"
+         not-null="true"
+         unique="false"/>
       <property
-            name="state"
-            column="SER_STATE"
-            not-null="false"
-            unique="false"
-            length="50000000"/>
+         name="state"
+         column="SER_STATE"
+         not-null="false"
+         unique="false"
+         length="50000000"/>
       <map
-            name="securityBindings"
-            sort="unsorted"
-            inverse="true"
-            cascade="none"
-            fetch="join">
+         name="securityBindings"
+         sort="unsorted"
+         inverse="true"
+         cascade="none"
+         fetch="join">
          <cache usage="@portal.hibernate.cache.usage@"/>
          <key column="INSTANCE_PK"/>
          <index column="ROLE" type="string"/>
          <one-to-many class="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"/>
       </map>
       <set
-            name="customizations"
-            inverse="true"
-            cascade="save-update"
-            fetch="select"
-            lazy="extra">
+         name="customizations"
+         inverse="true"
+         cascade="save-update"
+         fetch="select"
+         lazy="extra">
          <cache usage="@portal.hibernate.cache.usage@"/>
          <key column="INSTANCE_PK"/>
          <one-to-many class="org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl"/>
@@ -60,76 +83,76 @@
    </class>
 
    <class
-         name="org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl"
-         table="JBP_INSTANCE_PER_USER">
+      name="org.jboss.portal.core.impl.model.instance.InstanceCustomizationImpl"
+      table="JBP_INSTANCE_PER_USER">
       <cache usage="@portal.hibernate.cache.usage@"/>
       <id
-            name="key"
-            column="PK"
-            access="field">
+         name="key"
+         column="PK"
+         access="field">
          <generator class="native">
             <param name="sequence">instance_seq</param>
          </generator>
       </id>
       <many-to-one
-            name="def"
-            column="INSTANCE_PK"
-            class="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
-            cascade="none"
-            fetch="select"/>
+         name="def"
+         column="INSTANCE_PK"
+         class="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
+         cascade="none"
+         fetch="select"/>
       <property
-            name="state"
-            column="SER_STATE"
-            not-null="false"
-            unique="false"
-            length="50000000"/>
+         name="state"
+         column="SER_STATE"
+         not-null="false"
+         unique="false"
+         length="50000000"/>
       <properties
-            name="user_and_portlet_ref"
-            unique="true">
+         name="user_and_portlet_ref"
+         unique="true">
          <property
-               name="customizationId"
-               column="USER_ID"
-               not-null="true"
-               length="170"/>
+            name="customizationId"
+            column="USER_ID"
+            not-null="true"
+            length="170"/>
          <property
-               name="portletRef"
-               column="PORTLET_REF"
-               not-null="true"
-               length="170"/>
+            name="portletRef"
+            column="PORTLET_REF"
+            not-null="true"
+            length="170"/>
       </properties>
    </class>
 
    <class
-         name="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"
-         table="JBP_INSTANCE_SECURITY">
+      name="org.jboss.portal.core.impl.model.instance.InstanceSecurityBinding"
+      table="JBP_INSTANCE_SECURITY">
       <cache usage="@portal.hibernate.cache.usage@"/>
       <id
-            name="key"
-            column="PK"
-            type="java.lang.Long">
+         name="key"
+         column="PK"
+         type="java.lang.Long">
          <generator class="native">
             <param name="sequence">instance_seq</param>
          </generator>
       </id>
       <property
-            name="role"
-            column="ROLE"
-            not-null="true"
-            unique="false"/>
+         name="role"
+         column="ROLE"
+         not-null="true"
+         unique="false"/>
       <set
-            name="actions"
-            table="JBP_INSTANCE_SECURITY_ACTIONS"
-            cascade="none"
-            fetch="join">
+         name="actions"
+         table="JBP_INSTANCE_SECURITY_ACTIONS"
+         cascade="none"
+         fetch="join">
          <cache usage="@portal.hibernate.cache.usage@"/>
          <key column="PK"/>
          <element column="ACTIONS" type="string"/>
       </set>
       <many-to-one
-            name="instance"
-            column="INSTANCE_PK"
-            class="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
-            cascade="none"
-            fetch="select"/>
+         name="instance"
+         column="INSTANCE_PK"
+         class="org.jboss.portal.core.impl.model.instance.InstanceDefinitionImpl"
+         cascade="none"
+         fetch="select"/>
    </class>
 </hibernate-mapping> 

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/ehcache.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <ehcache>
 
    <!-- Sets the path to the directory where cache .data files are created.
@@ -12,27 +35,27 @@
    <diskStore path="java.io.tmpdir/instance"/>
 
 
-    <!--Default Cache configuration. These will applied to caches programmatically created through
-        the CacheManager.
+   <!--Default Cache configuration. These will applied to caches programmatically created through
+   the CacheManager.
 
-        The following attributes are required for defaultCache:
+   The following attributes are required for defaultCache:
 
-        maxInMemory       - Sets the maximum number of objects that will be created in memory
-        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
-                            is never expired.
-        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
-                            if the element is not eternal. Idle time is now - last accessed time
-        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
-                            if the element is not eternal. TTL is now - creation time
-        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
-                            has reached the maxInMemory limit.
+   maxInMemory       - Sets the maximum number of objects that will be created in memory
+   eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                       is never expired.
+   timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                       if the element is not eternal. Idle time is now - last accessed time
+   timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                       if the element is not eternal. TTL is now - creation time
+   overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                       has reached the maxInMemory limit.
 
-        -->
-    <defaultCache
-        maxElementsInMemory="10000"
-        eternal="false"
-        timeToIdleSeconds="120"
-        timeToLiveSeconds="120"
-        overflowToDisk="false"
-        />
+   -->
+   <defaultCache
+      maxElementsInMemory="10000"
+      eternal="false"
+      timeToIdleSeconds="120"
+      timeToLiveSeconds="120"
+      overflowToDisk="false"
+      />
 </ehcache>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/instance/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+   "-//Hibernate/Hibernate Configuration DTD//EN"
+   "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
    <session-factory>
       <property name="connection.datasource">java:@portal.datasource.name@</property>
@@ -16,7 +39,7 @@
          <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
          @portal.single.xml.open@
       -->
-      
+
       <!--
          | Comment in clustered mode
          @portal.clustered.xml.close@
@@ -24,7 +47,7 @@
          <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
          @portal.clustered.xml.open@
       -->
-      
+
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
-      "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-      "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+   "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+   "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping>
    <class
       name="org.jboss.portal.core.impl.model.portal.ObjectNode"
@@ -53,7 +76,7 @@
          name="securityConstraints"
          inverse="true"
          cascade="all-delete-orphan"
-         fetch="join" >
+         fetch="join">
          <cache usage="@portal.hibernate.cache.usage@"/>
          <key column="NODE_KEY"/>
 		   <index
@@ -140,8 +163,8 @@
          table="JBP_WINDOW">
          <key column="PK"/>
          <property
-         name="instanceRef"
-         column="INSTANCE_REF"/>
+            name="instanceRef"
+            column="INSTANCE_REF"/>
       </joined-subclass>
    </class>
 	
@@ -151,7 +174,7 @@
       <cache usage="@portal.hibernate.cache.usage@"/> 
 	   <id
          name="key"
-	      column="PK">
+         column="PK">
          <generator class="native">
             <param name="sequence">sec_seq</param>
          </generator>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/ehcache.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <ehcache>
 
     <!-- Sets the path to the directory where cache .data files are created.
@@ -9,30 +32,30 @@
          user.home - User's home directory
          user.dir - User's current working directory
          java.io.tmpdir - Default temp file path -->
-    <diskStore path="java.io.tmpdir/portal"/>
+   <diskStore path="java.io.tmpdir/portal"/>
 
 
-    <!--Default Cache configuration. These will applied to caches programmatically created through
-        the CacheManager.
+   <!--Default Cache configuration. These will applied to caches programmatically created through
+   the CacheManager.
 
-        The following attributes are required for defaultCache:
+   The following attributes are required for defaultCache:
 
-        maxInMemory       - Sets the maximum number of objects that will be created in memory
-        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
-                            is never expired.
-        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
-                            if the element is not eternal. Idle time is now - last accessed time
-        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
-                            if the element is not eternal. TTL is now - creation time
-        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
-                            has reached the maxInMemory limit.
+   maxInMemory       - Sets the maximum number of objects that will be created in memory
+   eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                       is never expired.
+   timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                       if the element is not eternal. Idle time is now - last accessed time
+   timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                       if the element is not eternal. TTL is now - creation time
+   overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                       has reached the maxInMemory limit.
 
-        -->
-    <defaultCache
-        maxElementsInMemory="10000"
-        eternal="false"
-        timeToIdleSeconds="120"
-        timeToLiveSeconds="120"
-        overflowToDisk="false"
-        />
+   -->
+   <defaultCache
+      maxElementsInMemory="10000"
+      eternal="false"
+      timeToIdleSeconds="120"
+      timeToLiveSeconds="120"
+      overflowToDisk="false"
+      />
 </ehcache>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portal/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+   "-//Hibernate/Hibernate Configuration DTD//EN"
+   "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
    <session-factory>
       <property name="connection.datasource">java:@portal.datasource.name@</property>
@@ -16,7 +39,7 @@
          <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
          @portal.single.xml.open@
       -->
-      
+
       <!--
          | Comment in clustered mode
          @portal.clustered.xml.close@
@@ -24,7 +47,7 @@
          <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
          @portal.clustered.xml.open@
       -->
-      
+
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/ehcache.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <ehcache>
 
     <!-- Sets the path to the directory where cache .data files are created.
@@ -9,30 +32,30 @@
          user.home - User's home directory
          user.dir - User's current working directory
          java.io.tmpdir - Default temp file path -->
-    <diskStore path="java.io.tmpdir/portlet"/>
+   <diskStore path="java.io.tmpdir/portlet"/>
 
 
-    <!--Default Cache configuration. These will applied to caches programmatically created through
-        the CacheManager.
+   <!--Default Cache configuration. These will applied to caches programmatically created through
+   the CacheManager.
 
-        The following attributes are required for defaultCache:
+   The following attributes are required for defaultCache:
 
-        maxInMemory       - Sets the maximum number of objects that will be created in memory
-        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
-                            is never expired.
-        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
-                            if the element is not eternal. Idle time is now - last accessed time
-        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
-                            if the element is not eternal. TTL is now - creation time
-        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
-                            has reached the maxInMemory limit.
+   maxInMemory       - Sets the maximum number of objects that will be created in memory
+   eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                       is never expired.
+   timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                       if the element is not eternal. Idle time is now - last accessed time
+   timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                       if the element is not eternal. TTL is now - creation time
+   overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                       has reached the maxInMemory limit.
 
-        -->
-    <defaultCache
-        maxElementsInMemory="10000"
-        eternal="false"
-        timeToIdleSeconds="120"
-        timeToLiveSeconds="120"
-        overflowToDisk="false"
-        />
+   -->
+   <defaultCache
+      maxElementsInMemory="10000"
+      eternal="false"
+      timeToIdleSeconds="120"
+      timeToLiveSeconds="120"
+      overflowToDisk="false"
+      />
 </ehcache>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/portlet/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+   "-//Hibernate/Hibernate Configuration DTD//EN"
+   "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
    <session-factory>
       <property name="connection.datasource">java:@portal.datasource.name@</property>
@@ -16,7 +39,7 @@
          <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
          @portal.single.xml.open@
       -->
-      
+
       <!--
          | Comment in clustered mode
          @portal.clustered.xml.close@
@@ -24,7 +47,7 @@
          <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
          @portal.clustered.xml.open@
       -->
-      
+
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/user/ehcache.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <ehcache>
 
     <!-- Sets the path to the directory where cache .data files are created.
@@ -9,30 +32,30 @@
          user.home - User's home directory
          user.dir - User's current working directory
          java.io.tmpdir - Default temp file path -->
-    <diskStore path="java.io.tmpdir/user"/>
+   <diskStore path="java.io.tmpdir/user"/>
 
 
-    <!--Default Cache configuration. These will applied to caches programmatically created through
-        the CacheManager.
+   <!--Default Cache configuration. These will applied to caches programmatically created through
+   the CacheManager.
 
-        The following attributes are required for defaultCache:
+   The following attributes are required for defaultCache:
 
-        maxInMemory       - Sets the maximum number of objects that will be created in memory
-        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
-                            is never expired.
-        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
-                            if the element is not eternal. Idle time is now - last accessed time
-        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
-                            if the element is not eternal. TTL is now - creation time
-        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
-                            has reached the maxInMemory limit.
+   maxInMemory       - Sets the maximum number of objects that will be created in memory
+   eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                       is never expired.
+   timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                       if the element is not eternal. Idle time is now - last accessed time
+   timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                       if the element is not eternal. TTL is now - creation time
+   overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                       has reached the maxInMemory limit.
 
-        -->
-    <defaultCache
-        maxElementsInMemory="10000"
-        eternal="false"
-        timeToIdleSeconds="120"
-        timeToLiveSeconds="120"
-        overflowToDisk="false"
-        />
+   -->
+   <defaultCache
+      maxElementsInMemory="10000"
+      eternal="false"
+      timeToIdleSeconds="120"
+      timeToLiveSeconds="120"
+      overflowToDisk="false"
+      />
 </ehcache>

Modified: trunk/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/hibernate/user/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
-    "-//Hibernate/Hibernate Configuration DTD//EN"
-    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+   "-//Hibernate/Hibernate Configuration DTD//EN"
+   "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
    <session-factory>
       <property name="connection.datasource">java:@portal.datasource.name@</property>
@@ -16,7 +39,7 @@
          <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
          @portal.single.xml.open@
       -->
-      
+
       <!--
          | Comment in clustered mode
          @portal.clustered.xml.close@
@@ -24,7 +47,7 @@
          <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
          @portal.clustered.xml.open@
       -->
-      
+
       <!-- Force the dialect instead of using autodetection -->
       <!--
       <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/login-config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version='1.0'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE policy PUBLIC
-      "-//JBoss//DTD JBOSS Security Config 3.0//EN"
-      "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+   "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+   "http://www.jboss.org/j2ee/dtd/security_config.dtd">
 <policy>
    <!-- For the JCR CMS -->
    <application-policy name="cms">

Modified: trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/standardjboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <portlet>
       <portlet-name>DefaultPortlet</portlet-name>

Modified: trunk/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/conf/theme/portal-layout.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib
    xmlns="http://java.sun.com/xml/ns/j2ee"
    xmlns:xsi="http://www.w3c.org/2001/XMLSchema-instance"

Modified: trunk/core/src/resources/portal-core-sar/portal-aop.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/portal-aop.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-sar/portal-aop.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <aop>
    <metadata
       tag="transaction"

Modified: trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml
===================================================================
--- trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/jboss-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
@@ -29,7 +52,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="driverClass"><inject bean="DataSourceConfig" property="driverClass"/></property>
       <property name="connectionURL"><inject bean="DataSourceConfig" property="connectionURL"/></property>
       <property name="userName"><inject bean="DataSourceConfig" property="userName"/></property>

Modified: trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml
===================================================================
--- trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/portal/jboss-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
@@ -23,7 +46,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="driverClass"><inject bean="DataSourceConfig" property="driverClass"/></property>
       <property name="connectionURL"><inject bean="DataSourceConfig" property="connectionURL"/></property>
       <property name="userName"><inject bean="DataSourceConfig" property="userName"/></property>

Modified: trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml
===================================================================
--- trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/state/jboss-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
@@ -23,7 +46,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="driverClass"><inject bean="DataSourceConfig" property="driverClass"/></property>
       <property name="connectionURL"><inject bean="DataSourceConfig" property="connectionURL"/></property>
       <property name="userName"><inject bean="DataSourceConfig" property="userName"/></property>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 _ASREGISTERED=Don't have an account yet?  You can <a href\="index.html?module=user&op=getlogin">create one</a>.
 _BLOCKNICKNAME=Username
 _BLOCKPASSWORD=Password

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 _ASREGISTERED=Don't have an account yet?  You can <a href\="index.html?module=user&op=getlogin">create one</a>.
 _BLOCKNICKNAME=Username
 _BLOCKPASSWORD=Password

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 _ASREGISTERED=¿No tiene una cuenta todavía? Puede <a href\="index.html?module=user&op=getlogin">crear una</a>.
 _BLOCKNICKNAME=Usuario
 _BLOCKPASSWORD=Clave

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 _BLOCKNICKNAME=Identifiant
 _BLOCKPASSWORD=Mot de passe
 

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/faces-config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/faces-config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE faces-config PUBLIC
    "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
    "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-app.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-app>
    <app-name>portal</app-name>
 </jboss-app>
\ No newline at end of file

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <portlet>
       <portlet-name>UserPortlet</portlet-name>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
 </jboss-web>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-renderSet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portal-renderSet>
    <renderSet name="divRenderer">
       <set content-type="text/html">

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/layout/portal-strategies.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portal-strategies>
    <set name="maximizedRegion">
       <strategy content-type="text/html">

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portal-layouts.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <layouts>
    <layout>
       <name>nodesk</name>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portal-lib.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-  version="2.0">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
    <tlib-version>1.1</tlib-version>
    <short-name>JBoss-Portal-tags</short-name>
 

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portal-themes.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,19 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <themes>
    <theme>
       <name>industrial</name>
-       <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css" type="text/css" />
-       <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico" />
+       <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css" type="text/css"/>
+       <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico"/>
    </theme>
    <theme>
       <name>Nphalanx</name>
-       <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css" />
-       <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico" />
+       <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css"/>
+       <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico"/>
    </theme>
    <theme>
       <name>mission-critical</name>
-       <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css" />
-       <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico" />
+       <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css"/>
+       <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico"/>
    </theme>
    <theme>
     <name>Maple</name>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
       <instance>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app
-      xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-      version="1.0">
+   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   version="1.0">
    <portlet>
       <description>Portlet providing user login/logout and profile management</description>
       <portlet-name>UserPortlet</portlet-name>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/theme-basic-lib.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-  version="2.0">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
    <tlib-version>1.1</tlib-version>
    <short-name>Theme_basic_tags</short-name>
    <tag>

Modified: trunk/core/src/resources/portal-core-war/WEB-INF/web.xml
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app
    xmlns="http://java.sun.com/xml/ns/j2ee"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource.properties
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 javax.portlet.preference.description.RssXml=RSS feed URL
 javax.portlet.preference.description.expires=Expiration time

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_fr.properties
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_fr.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_fr.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 javax.portlet.preference.description.RssXml=URL du flux RSS
 javax.portlet.preference.description.expires=Temps d'expiration

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/default-object.xml
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/default-object.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/default-object.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
       <parent-ref>default</parent-ref>

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-app.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-app>
    <app-name>samples</app-name>
 </jboss-app>
\ No newline at end of file

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <remotable>true</remotable>
    <portlet>

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/info/view.jsp	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
 <%@ page isELIgnored="false" %>
 
@@ -6,23 +29,27 @@
 <table border="0" cellspacing="2" cellpadding="2">
    <tr>
       <td align="center"><a href="http://portal.demo.jboss.com"><img
-            src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
-            alt="Try the latest release of JBoss Portal, live and online."></a>
+         src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+         alt="Try the latest release of JBoss Portal, live and online."></a>
          <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
-               src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
-               alt="Download JBoss Portal and have it up and running in minutes."></a>
+            src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+            alt="Download JBoss Portal and have it up and running in minutes."></a>
          <a href="http://www.portletswap.com" target="_blank"><img
-               src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
-               alt="Download portlets and layouts for your new JBoss Portal installation."></a></td>
+            src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+            alt="Download portlets and layouts for your new JBoss Portal installation."></a></td>
    </tr>
-   <tr><td></td></tr>
    <tr>
+      <td></td>
+   </tr>
+   <tr>
       <td class="portlet-section-alternate">
          <font class="portlet-font">This is a basic installation of JBoss Portal's most recent release. You may log in
             at any time, using the User Portlet below with the following credentials:</font>
       </td>
-   </tr><tr><td class="portlet-section-alternate" align="center">
-   <b>user/user</b> or <b>admin/admin</b>
-</td>
-</tr>
+   </tr>
+   <tr>
+      <td class="portlet-section-alternate" align="center">
+         <b>user/user</b> or <b>admin/admin</b>
+      </td>
+   </tr>
 </table>

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/news/edit.jsp
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/news/edit.jsp	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/news/edit.jsp	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
 <%@ page isELIgnored="false" %>
 

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
 <!-- this is static markup to test themes for wsrp css selector support -->
 <div id="wsrp_section_selectors">
    <table border="0" width="100%" cellpadding="2">
@@ -52,11 +75,13 @@
          <td class="portlet-table-footer">portlet-table-footer</td>
       </tr>
    </table>
-</div><br>
+</div>
+<br>
 
 <div id="wsrp_form_selectors">
    <form action="">
-      <fieldset><legend>A Sample Form:</legend>
+      <fieldset>
+         <legend>A Sample Form:</legend>
          <table border="0" width="100%" cellpadding="2">
             <tr>
                <td class="portlet-form-label" colspan="2">portlet-form-label</td>
@@ -73,8 +98,12 @@
                                                                          for="select-control">
                   portlet-form-field-label:</label></td>
                <td>
-                  <select id="select-control" class="portlet-form-field"><option>portlet-form-field</option><option>
-                     Option 2</option></select>
+                  <select id="select-control" class="portlet-form-field">
+                     <option>portlet-form-field</option>
+                     <option>
+                        Option 2
+                     </option>
+                  </select>
                </td>
             </tr>
             <tr>
@@ -86,7 +115,8 @@
          </table>
       </fieldset>
    </form>
-</div><br>
+</div>
+<br>
 
 <div id="wsrp_message_selectors">
    <table border="0" width="100%" cellpadding="2">

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/weather/edit.jsp
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/weather/edit.jsp	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/jsp/weather/edit.jsp	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
 <%@ page isELIgnored="false" %>
 

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" standalone="yes"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
       <instance>

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/portlet.xml
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app
    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/web.xml
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss1.xsl	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <xsl:stylesheet
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      version="1.0">
+   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   version="1.0">
 
    <xsl:output method="html"/>
 

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/news/Rss2.xsl	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
    <xsl:variable name="link-path">

Modified: trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl
===================================================================
--- trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-samples-war/WEB-INF/xsl/weather/Rss.xsl	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
    <xsl:output method="xml" omit-xml-declaration="yes" indent="yes"/>
    <xsl:variable name="image-path">http://us.i1.yimg.com/us.yimg.com/i/us/we/52/</xsl:variable>
@@ -12,7 +35,7 @@
             <b>
                <xsl:for-each select="rss/channel/location">
                   <xsl:value-of select="@city"/>, <xsl:value-of select="@region"/>, <xsl:value-of
-                     select="@country"/>
+                  select="@country"/>
                </xsl:for-each>
             </b>
          </font>

Modified: trunk/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-server-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
    <security-domain>java:jaas/portal</security-domain>
    <context-root>@portal.web.context-root@</context-root>

Modified: trunk/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml
===================================================================
--- trunk/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-server-war/WEB-INF/server-layouts.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <layouts/>

Modified: trunk/core/src/resources/portal-server-war/WEB-INF/web.xml
===================================================================
--- trunk/core/src/resources/portal-server-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-server-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/core/src/resources/portal-server-war/error.jsp
===================================================================
--- trunk/core/src/resources/portal-server-war/error.jsp	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-server-war/error.jsp	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -13,7 +36,9 @@
          <div id="logoName"></div>
          <table border="0" cellpadding="0" cellspacing="0" id="header-container">
             <tr>
-               <td align="center" valign="top" id="header"><div id="spacer"></div></td>
+               <td align="center" valign="top" id="header">
+                  <div id="spacer"></div>
+               </td>
             </tr>
          </table>
          <div id="content-container">

Modified: trunk/core/src/resources/portal-server-war/login.jsp
===================================================================
--- trunk/core/src/resources/portal-server-war/login.jsp	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/portal-server-war/login.jsp	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                             ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                  ~
+  ~ contributors as indicated by the @authors tag. See the                   ~
+  ~ copyright.txt in the distribution for a full listing of                  ~
+  ~ individual contributors.                                                 ~
+  ~                                                                          ~
+  ~ This is free software; you can redistribute it and/or modify it          ~
+  ~ under the terms of the GNU Lesser General Public License as              ~
+  ~ published by the Free Software Foundation; either version 2.1 of         ~
+  ~ the License, or (at your option) any later version.                      ~
+  ~                                                                          ~
+  ~ This software is distributed in the hope that it will be useful,         ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of           ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU         ~
+  ~ Lesser General Public License for more details.                          ~
+  ~                                                                          ~
+  ~ You should have received a copy of the GNU Lesser General Public         ~
+  ~ License along with this software; if not, write to the Free              ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA       ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                 ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
+
 <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Modified: trunk/core/src/resources/setup/portal-ds.xml
===================================================================
--- trunk/core/src/resources/setup/portal-ds.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/setup/portal-ds.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <datasources>
   <local-tx-datasource>
     <jndi-name>@portal.datasource.name@</jndi-name>

Modified: trunk/core/src/resources/test/cache/domain.xml
===================================================================
--- trunk/core/src/resources/test/cache/domain.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/cache/domain.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <slide>
    <namespace name="slide">
       <definition>
@@ -143,22 +166,26 @@
                -->
                <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/root">
                   <revision>
-                     <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/root</D:href>]]></property>
+                     <property
+                        name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/root</D:href>]]></property>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/user">
                   <revision>
-                     <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/john</D:href><D:href xmlns:D='DAV:'>/users/john2</D:href><D:href xmlns:D='DAV:'>/users/root</D:href><D:href xmlns:D='DAV:'>/users/projector</D:href>]]></property>
+                     <property
+                        name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/john</D:href><D:href xmlns:D='DAV:'>/users/john2</D:href><D:href xmlns:D='DAV:'>/users/root</D:href><D:href xmlns:D='DAV:'>/users/projector</D:href>]]></property>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/guest">
                   <revision>
-                     <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/guest</D:href>]]></property>
+                     <property
+                        name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/guest</D:href>]]></property>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/roles/projector">
                   <revision>
-                     <property name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/root</D:href><D:href xmlns:D='DAV:'>/users/projector</D:href>]]></property>
+                     <property
+                        name="group-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/users/root</D:href><D:href xmlns:D='DAV:'>/users/projector</D:href>]]></property>
                   </revision>
                </objectnode>
             </objectnode>
@@ -166,7 +193,8 @@
             <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions">
                <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/read">
                   <revision>
-                     <property name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/read-acl</D:href> <D:href xmlns:D='DAV:'>/actions/read-current-user-privilege-set</D:href>]]></property>
+                     <property
+                        name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/read-acl</D:href> <D:href xmlns:D='DAV:'>/actions/read-current-user-privilege-set</D:href>]]></property>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/read-acl">
@@ -174,14 +202,16 @@
                      <property name="privilege-member-set"/>
                   </revision>
                </objectnode>
-               <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/read-current-user-privilege-set">
+               <objectnode classname="org.apache.slide.structure.ActionNode"
+                           uri="/actions/read-current-user-privilege-set">
                   <revision>
                      <property name="privilege-member-set"/>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/write">
                   <revision>
-                     <property name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/write-acl</D:href> <D:href xmlns:D='DAV:'>/actions/write-properties</D:href> <D:href xmlns:D='DAV:'>/actions/write-content</D:href>]]></property>
+                     <property
+                        name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/write-acl</D:href> <D:href xmlns:D='DAV:'>/actions/write-properties</D:href> <D:href xmlns:D='DAV:'>/actions/write-content</D:href>]]></property>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/write-acl">
@@ -196,7 +226,8 @@
                </objectnode>
                <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/write-content">
                   <revision>
-                     <property name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/bind</D:href> <D:href xmlns:D='DAV:'>/actions/unbind</D:href>]]></property>
+                     <property
+                        name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/bind</D:href> <D:href xmlns:D='DAV:'>/actions/unbind</D:href>]]></property>
                   </revision>
                </objectnode>
                <objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/bind">

Modified: trunk/core/src/resources/test/cache/local.xml
===================================================================
--- trunk/core/src/resources/test/cache/local.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/cache/local.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
    <mbean code="org.jboss.cache.TreeCache"
-      name="jboss.cache:service=TreeCache">
+          name="jboss.cache:service=TreeCache">
       <attribute name="TransactionManagerLookupClass">org.jboss.portal.core.impl.tree.tm.Blah</attribute>
       <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
       <attribute name="CacheMode">LOCAL</attribute>

Modified: trunk/core/src/resources/test/cache/replicated.xml
===================================================================
--- trunk/core/src/resources/test/cache/replicated.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/cache/replicated.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
     <mbean
-        code="org.jboss.cache.TreeCache"
-        name="jboss.cache:service=TreeCache">
+       code="org.jboss.cache.TreeCache"
+       name="jboss.cache:service=TreeCache">
         <attribute name="TransactionManagerLookupClass">org.jboss.cache.DummyTransactionManagerLookup</attribute>
         <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
         <attribute name="CacheMode">REPL_SYNC</attribute>
@@ -15,32 +38,32 @@
                 <!-- UDP: if you have a multihomed machine,
                 set the bind_addr attribute to the appropriate NIC IP address, e.g bind_addr="192.168.0.2"
                 -->
-                <!-- UDP: On Windows machines, because of the media sense feature
-                 being broken with multicast (even after disabling media sense)
-                 set the loopback attribute to true -->
-                <UDP
-                    mcast_addr="228.1.2.3" mcast_port="48866"
-                    ip_ttl="64" ip_mcast="true"
-                    mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
-                    ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
-                    loopback="false"/>
+               <!-- UDP: On Windows machines, because of the media sense feature
+         being broken with multicast (even after disabling media sense)
+         set the loopback attribute to true -->
+               <UDP
+                  mcast_addr="228.1.2.3" mcast_port="48866"
+                  ip_ttl="64" ip_mcast="true"
+                  mcast_send_buf_size="150000" mcast_recv_buf_size="80000"
+                  ucast_send_buf_size="150000" ucast_recv_buf_size="80000"
+                  loopback="false"/>
                 <PING timeout="2000" num_initial_members="3"
-                    up_thread="false" down_thread="false"/>
+                      up_thread="false" down_thread="false"/>
                 <MERGE2 min_interval="10000" max_interval="20000"/>
-                <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
-                <FD_SOCK/>
+               <!--        <FD shun="true" up_thread="true" down_thread="true" />-->
+               <FD_SOCK/>
                 <VERIFY_SUSPECT timeout="1500"
-                    up_thread="false" down_thread="false"/>
+                                up_thread="false" down_thread="false"/>
                 <pbcast.NAKACK gc_lag="50" retransmit_timeout="600,1200,2400,4800"
-                    max_xmit_size="8192" up_thread="false" down_thread="false"/>
+                               max_xmit_size="8192" up_thread="false" down_thread="false"/>
                 <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"
-                    down_thread="false"/>
+                         down_thread="false"/>
                 <pbcast.STABLE desired_avg_gossip="20000"
-                    up_thread="false" down_thread="false"/>
+                               up_thread="false" down_thread="false"/>
                 <FRAG frag_size="8192"
-                    down_thread="false" up_thread="false"/>
+                      down_thread="false" up_thread="false"/>
                 <pbcast.GMS join_timeout="5000" join_retry_timeout="2000"
-                    shun="true" print_local_addr="true"/>
+                            shun="true" print_local_addr="true"/>
                 <pbcast.STATE_TRANSFER up_thread="true" down_thread="true"/>
             </config>
         </attribute>

Modified: trunk/core/src/resources/test/datarole.xml
===================================================================
--- trunk/core/src/resources/test/datarole.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/datarole.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <dataset>
   <jbp_permissions/>
   <jbp_role_membership jbp_uid="1" jbp_rid="1"/>
@@ -9,6 +32,10 @@
   <jbp_user_pref_prop_value/>
   <jbp_user_pref_set/>
   <jbp_user_prop/>
-  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
-  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
+  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
+  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
 </dataset>

Modified: trunk/core/src/resources/test/datarolecreated.xml
===================================================================
--- trunk/core/src/resources/test/datarolecreated.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/datarolecreated.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <dataset>
   <jbp_permissions/>
   <jbp_role_membership jbp_uid="1" jbp_rid="1"/>
@@ -10,6 +33,10 @@
   <jbp_user_pref_prop_value/>
   <jbp_user_pref_set/>
   <jbp_user_prop/>
-  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
-  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
+  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
+  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
 </dataset>

Modified: trunk/core/src/resources/test/dataroledeleted.xml
===================================================================
--- trunk/core/src/resources/test/dataroledeleted.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/dataroledeleted.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <dataset>
   <jbp_permissions/>
   <jbp_role_membership jbp_uid="1" jbp_rid="1"/>
@@ -7,6 +30,10 @@
   <jbp_user_pref_prop_value/>
   <jbp_user_pref_set/>
   <jbp_user_prop/>
-  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
-  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
+  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
+  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
 </dataset>

Modified: trunk/core/src/resources/test/dataroleedited.xml
===================================================================
--- trunk/core/src/resources/test/dataroleedited.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/dataroleedited.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <dataset>
   <jbp_permissions/>
   <jbp_role_membership jbp_uid="1" jbp_rid="1"/>
@@ -9,6 +32,10 @@
   <jbp_user_pref_prop_value/>
   <jbp_user_pref_set/>
   <jbp_user_prop/>
-  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
-  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee" jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1" jbp_enabled="1"/>
+  <jbp_users jbp_uid="1" jbp_uname="admin" jbp_password="21232f297a57a5a743894a0e4a801fc3"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
+  <jbp_users jbp_uid="2" jbp_uname="user" jbp_password="ee11cbb19052e40b07aac0ca060c23ee"
+             jbp_realemail="portal at example.com" jbp_regdate="2005-03-11 16:24:39.0" jbp_viewrealemail="1"
+             jbp_enabled="1"/>
 </dataset>

Modified: trunk/core/src/resources/test/deployment/jboss-portlet.xml
===================================================================
--- trunk/core/src/resources/test/deployment/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/deployment/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <portlet>
       <portlet-name>Portlet1</portlet-name>

Modified: trunk/core/src/resources/test/hibernate.properties
===================================================================
--- trunk/core/src/resources/test/hibernate.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/hibernate.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.connection.driver_class=org.hsqldb.jdbcDriver
 hibernate.connection.url=jdbc:hsqldb:test

Modified: trunk/core/src/resources/test/log4j.properties
===================================================================
--- trunk/core/src/resources/test/log4j.properties	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/log4j.properties	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+################################################################################
+# JBoss, a division of Red Hat                                                 #
+# Copyright 2006, Red Hat Middleware, LLC, and individual                      #
+# contributors as indicated by the @authors tag. See the                       #
+# copyright.txt in the distribution for a full listing of                      #
+# individual contributors.                                                     #
+#                                                                              #
+# This is free software; you can redistribute it and/or modify it              #
+# under the terms of the GNU Lesser General Public License as                  #
+# published by the Free Software Foundation; either version 2.1 of             #
+# the License, or (at your option) any later version.                          #
+#                                                                              #
+# This software is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             #
+# Lesser General Public License for more details.                              #
+#                                                                              #
+# You should have received a copy of the GNU Lesser General Public             #
+# License along with this software; if not, write to the Free                  #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA           #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.                     #
+################################################################################
+
 ### direct log messages to stdout ###
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out

Modified: trunk/core/src/resources/test/theme.xml
===================================================================
--- trunk/core/src/resources/test/theme.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/core/src/resources/test/theme.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <dataset>
   <jbp_user_prop jbp_uid="2" jbp_name="portal.user.theme" jbp_value="blah.blah"/>
 </dataset>

Modified: trunk/faces/build.xml
===================================================================
--- trunk/faces/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,12 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
-]>
+   ]>
 
 <!-- $Id$ -->
 
@@ -31,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -101,8 +124,8 @@
    <!--+====================================================================+-->
 
    <target name="compile"
-      description="Compile all source files."
-      depends="_default:compile-classes,
+           description="Compile all source files."
+           depends="_default:compile-classes,
                _default:compile-etc,
                _default:compile-resources">
       <!-- Add module specific elements here. -->
@@ -117,8 +140,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <!-- portal-faces-lib.jar -->
       <mkdir dir="${build.lib}"/>

Modified: trunk/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/el/DelegatingPropertyResolver.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.el;
 
 import org.apache.log4j.Logger;
 
-import javax.faces.el.PropertyResolver;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.PropertyNotFoundException;
+import javax.faces.el.PropertyResolver;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * A property resolver that provide fine grained configuration of the resolving mechanism.
@@ -147,9 +148,8 @@
    }
 
    /**
-    * Resolve the type def from the provided object.
-    * First the class name is used to lookup a type def.
-    * If none is found then the implemented interfaces are examined to see if one can provide a type def.
+    * Resolve the type def from the provided object. First the class name is used to lookup a type def. If none is found
+    * then the implemented interfaces are examined to see if one can provide a type def.
     *
     * @param base the object to resolve the type def
     * @return the type def if found, null otherwise

Modified: trunk/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/el/PropertyAccessor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.el;
 
 /**

Modified: trunk/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/el/PropertyDef.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.el;
 
 /**

Modified: trunk/faces/src/main/org/jboss/portal/faces/el/TypeDef.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/el/TypeDef.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/el/TypeDef.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.el;
 
-import org.jboss.portal.faces.el.PropertyDef;
-
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/AbstractCellAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.matrix;
 
 import javax.faces.context.FacesContext;

Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/Cell.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/Cell.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/Cell.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.matrix;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/ColumnDef.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.matrix;
 
 /**

Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/Matrix.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.matrix;
 
-import org.jboss.portal.faces.matrix.ColumnDef;
-
 import javax.faces.model.ListDataModel;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -67,14 +66,14 @@
       this.handback = handback;
 
       //
-      for (int i = 0;i < rowSize;i++)
+      for (int i = 0; i < rowSize; i++)
       {
          rowIndices.add(new Integer(i));
 //         rows.add(new Row(this, colSize, i));
       }
 
       //
-      for (int i = 0;i < colSize;i++)
+      for (int i = 0; i < colSize; i++)
       {
          colIndices.add(new Integer(i));
          colDefs.add(new ColumnDef());

Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/Row.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/Row.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/Row.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.matrix;
 
 /**

Modified: trunk/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/main/org/jboss/portal/faces/matrix/RowSetModel.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.faces.matrix;
 
 import javax.faces.model.ListDataModel;
@@ -51,7 +52,7 @@
       this.mutable = true;
 
       //
-      for (int i = 0;i < size;i++)
+      for (int i = 0; i < size; i++)
       {
          rows.add(new Row(this, i));
       }

Modified: trunk/faces/src/resources/portal-faces-lib-jar/composite.tld
===================================================================
--- trunk/faces/src/resources/portal-faces-lib-jar/composite.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/resources/portal-faces-lib-jar/composite.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib>
    <tlib-version>0.03</tlib-version>
    <jsp-version>2.0</jsp-version>

Modified: trunk/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml
===================================================================
--- trunk/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/resources/portal-faces-war/WEB-INF/faces-config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
+   "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
 <faces-config>
    <component>
       <component-type>custom1</component-type>

Modified: trunk/faces/src/resources/portal-faces-war/WEB-INF/web.xml
===================================================================
--- trunk/faces/src/resources/portal-faces-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/faces/src/resources/portal-faces-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
    <listener>
      <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
    </listener>

Modified: trunk/federation/build.xml
===================================================================
--- trunk/federation/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
@@ -63,7 +86,7 @@
       <property name="junit.formatter.usefile" value="true"/>
 
       <!-- Configure thirdparty libraries -->
-       &libraries;
+      &libraries;
       <path id="library.classpath">
          <path refid="dom4j.dom4j.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>

Modified: trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/FederatedPortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation;
 
 import org.jboss.portal.portlet.PortletInvoker;

Modified: trunk/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/FederatingPortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation;
 
+import org.jboss.portal.federation.spi.PortletInvokerRegistration;
 import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.federation.spi.PortletInvokerRegistration;
 
 import java.util.Collection;
 

Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation.impl;
 
 import org.jboss.portal.portlet.Portlet;

Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatedPortletInvokerService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation.impl;
 
 import org.jboss.portal.common.invocation.InvocationException;

Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/FederatingPortletInvokerService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,49 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation.impl;
 
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.federation.FederatedPortletInvoker;
 import org.jboss.portal.federation.FederatingPortletInvoker;
 import org.jboss.portal.federation.spi.PortletInvokerRegistration;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.InvokerUnavailableException;
 import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
-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.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Collection;
-import java.util.List;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation.impl;
 
 import org.jboss.portal.federation.FederatingPortletInvoker;
 import org.jboss.portal.federation.spi.PortletInvokerRegistration;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 /**
  * Register any portlet invoker into a federating portlet invoker.

Modified: trunk/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java
===================================================================
--- trunk/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/federation/src/main/org/jboss/portal/federation/spi/PortletInvokerRegistration.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.federation.spi;
 
 import org.jboss.portal.portlet.PortletInvoker;

Modified: trunk/format/build.xml
===================================================================
--- trunk/format/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
@@ -6,7 +29,7 @@
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
-]>
+   ]>
 
 <!-- $Id$ -->
 
@@ -31,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -88,9 +111,8 @@
       <call target="configure-defaults"/>
       <call target="configure-tools"/>
       <call target="configure-jflex"/>
-       
-      
 
+
       <!--+=======================================+-->
       <!--| Define module specific elements here. |-->
       <!--+=======================================+-->
@@ -125,7 +147,7 @@
          destdir="${build.gen.classes}">
       </jflex>
    </target>
-	
+
    <!--+====================================================================+-->
    <!--| Compile                                                            |-->
    <!--|                                                                    |-->
@@ -135,8 +157,8 @@
    <!--+====================================================================+-->
 
    <target name="compile"
-      description="Compile all source files."
-      depends="generate-parsers,
+           description="Compile all source files."
+           depends="generate-parsers,
                _default:compile-classes,
                _default:compile-etc,
                _default:compile-resources">
@@ -153,8 +175,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <mkdir dir="${build.lib}"/>
 
@@ -166,9 +188,9 @@
       </jar>
 
    </target>
-	
-	<!-- generates artifacts used for tests, requires output to be previously run
-	     -->
+
+   <!-- generates artifacts used for tests, requires output to be previously run
+         -->
    <target name="package-tests" depends="init">
 	</target>
 

Modified: trunk/format/src/main/org/jboss/portal/format/parser/AbstractParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/AbstractParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/AbstractParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser;
 
 
 /**
- * This is an abstract parser. All the parsed events will go though
- * the event notifier interface.
+ * This is an abstract parser. All the parsed events will go though the event notifier interface.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -35,17 +35,13 @@
    /** The event handler. */
    protected ParseEventHandler handler;
 
-   /**
-    * Set the event handler on this parser.
-    */
+   /** Set the event handler on this parser. */
    public void setHandler(ParseEventHandler handler)
    {
       this.handler = handler;
    }
 
-   /**
-    * Ask the parser to its job.
-    */
+   /** Ask the parser to its job. */
    public abstract void parse(char[] chars, int offset, int length);
 
 }

Modified: trunk/format/src/main/org/jboss/portal/format/parser/ParseEvent.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/ParseEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/ParseEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser;
 
-/**
- * An event that is emmited by ParseEventNotifier implementations.
- */
+/** An event that is emmited by ParseEventNotifier implementations. */
 public interface ParseEvent
 {
 }

Modified: trunk/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/ParseEventHandler.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser;
 
 
-/**
- * Implementors want to receive events produced by a parser.
- */
+/** Implementors want to receive events produced by a parser. */
 public interface ParseEventHandler
 {
    void handle(ParseEvent event);

Modified: trunk/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/ParseEventNotifier.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser;
 
 
-/**
- * Implemented by any class that wants to generate parsing events.
- */
+/** Implemented by any class that wants to generate parsing events. */
 public interface ParseEventNotifier
 {
    void setHandler(ParseEventHandler handler);

Modified: trunk/format/src/main/org/jboss/portal/format/parser/TextEvent.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/TextEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/TextEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser;
 
 
-/**
- * An event implementation that says there is some text to handle.
- */
+/** An event implementation that says there is some text to handle. */
 public class TextEvent implements ParseEvent
 {
 

Modified: trunk/format/src/main/org/jboss/portal/format/parser/Token.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/Token.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/Token.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser;
 
 /**

Modified: trunk/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/bbcode/BBCodeParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.bbcode;
 
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Iterator;
-
 import org.jboss.portal.format.parser.AbstractParser;
 import org.jboss.portal.format.parser.ParseEvent;
 import org.jboss.portal.format.parser.TextEvent;
@@ -32,6 +29,10 @@
 import org.jboss.portal.format.parser.chars.MutableChars;
 import org.jboss.portal.format.util.Stack;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.util.Iterator;
+
 /**
  * This nasty class parse BB code and create events.
  *
@@ -70,6 +71,7 @@
       {
          return 0;
       }
+
       public void close() throws IOException
       {
       }
@@ -87,6 +89,7 @@
       {
          return new CloseEvent();
       }
+
       protected boolean equals(Stack.Key key1, Stack.Key key2)
       {
          return ((CodeKey)key1).getType() == ((CodeKey)key2).getType();
@@ -122,123 +125,123 @@
          // According to the token we fire the approriate events
          switch (t.type)
          {
-         case Analyzer.OPEN_B:
-            _start(EVENT_BOLD, null);
-            break;
-         case Analyzer.CLOSE_B:
-            _end(EVENT_BOLD);
-            break;
+            case Analyzer.OPEN_B:
+               _start(EVENT_BOLD, null);
+               break;
+            case Analyzer.CLOSE_B:
+               _end(EVENT_BOLD);
+               break;
 
-         case Analyzer.OPEN_I:
-            _start(EVENT_ITALIC, null);
-            break;
-         case Analyzer.CLOSE_I:
-            _end(EVENT_ITALIC);
-            break;
+            case Analyzer.OPEN_I:
+               _start(EVENT_ITALIC, null);
+               break;
+            case Analyzer.CLOSE_I:
+               _end(EVENT_ITALIC);
+               break;
 
-         case Analyzer.OPEN_U:
-            _start(EVENT_UNDERLINE, null);
-            break;
-         case Analyzer.CLOSE_U:
-            _end(EVENT_UNDERLINE);
-            break;
+            case Analyzer.OPEN_U:
+               _start(EVENT_UNDERLINE, null);
+               break;
+            case Analyzer.CLOSE_U:
+               _end(EVENT_UNDERLINE);
+               break;
 
-         case Analyzer.OPEN_COLOR:
-            _start(EVENT_COLOR, t.value);
-            break;
-         case Analyzer.CLOSE_COLOR:
-            _end(EVENT_COLOR);
-            break;
+            case Analyzer.OPEN_COLOR:
+               _start(EVENT_COLOR, t.value);
+               break;
+            case Analyzer.CLOSE_COLOR:
+               _end(EVENT_COLOR);
+               break;
 
-         case Analyzer.OPEN_SIZE:
-            _start(EVENT_SIZE, t.value);
-            break;
-         case Analyzer.CLOSE_SIZE:
-            _end(EVENT_SIZE);
-            break;
+            case Analyzer.OPEN_SIZE:
+               _start(EVENT_SIZE, t.value);
+               break;
+            case Analyzer.CLOSE_SIZE:
+               _end(EVENT_SIZE);
+               break;
 
-         case Analyzer.OPEN_QUOTE_ANONYMOUS:
-            _start(EVENT_QUOTE, null);
-            break;
-         case Analyzer.OPEN_QUOTE:
-            _start(EVENT_QUOTE, t.value);
-            break;
-         case Analyzer.CLOSE_QUOTE:
-            _end(EVENT_QUOTE);
-            break;
+            case Analyzer.OPEN_QUOTE_ANONYMOUS:
+               _start(EVENT_QUOTE, null);
+               break;
+            case Analyzer.OPEN_QUOTE:
+               _start(EVENT_QUOTE, t.value);
+               break;
+            case Analyzer.CLOSE_QUOTE:
+               _end(EVENT_QUOTE);
+               break;
 
-         case Analyzer.OPEN_CODE:
-            _start(EVENT_CODE, null);
-            break;
-         case Analyzer.CLOSE_CODE:
-            _end(EVENT_CODE);
-            break;
+            case Analyzer.OPEN_CODE:
+               _start(EVENT_CODE, null);
+               break;
+            case Analyzer.CLOSE_CODE:
+               _end(EVENT_CODE);
+               break;
 
-         case Analyzer.OPEN_LIST_UNORDERED:
-            _start(EVENT_UNORDERED_LIST, null);
-            break;
-         case Analyzer.OPEN_LIST_ORDERED_NUMERICAL:
-            _start(EVENT_NUMERICALLY_ORDERED_LIST, null);
-            break;
-         case Analyzer.OPEN_LIST_ORDERED_ALPHABETICAL:
-            _start(EVENT_ALPHABETICALLY_ORDERED_LIST, null);
-            break;
+            case Analyzer.OPEN_LIST_UNORDERED:
+               _start(EVENT_UNORDERED_LIST, null);
+               break;
+            case Analyzer.OPEN_LIST_ORDERED_NUMERICAL:
+               _start(EVENT_NUMERICALLY_ORDERED_LIST, null);
+               break;
+            case Analyzer.OPEN_LIST_ORDERED_ALPHABETICAL:
+               _start(EVENT_ALPHABETICALLY_ORDERED_LIST, null);
+               break;
 
-         case Analyzer.CLOSE_LIST:
-            // If we match a list token on the stack at
-            // level -1 (because of the list item that should
-            // be pushed on the stack) we close
-            CodeKey tmp = (CodeKey)stack.peek(0);
-            if (tmp != null)
-            {
-               int type = tmp.type;
-               if (type == EVENT_UNORDERED_LIST ||
-                   type == EVENT_NUMERICALLY_ORDERED_LIST ||
-                   type == EVENT_ALPHABETICALLY_ORDERED_LIST)
+            case Analyzer.CLOSE_LIST:
+               // If we match a list token on the stack at
+               // level -1 (because of the list item that should
+               // be pushed on the stack) we close
+               CodeKey tmp = (CodeKey)stack.peek(0);
+               if (tmp != null)
                {
-                  _end(type);
+                  int type = tmp.type;
+                  if (type == EVENT_UNORDERED_LIST ||
+                     type == EVENT_NUMERICALLY_ORDERED_LIST ||
+                     type == EVENT_ALPHABETICALLY_ORDERED_LIST)
+                  {
+                     _end(type);
+                  }
                }
-            }
-            break;
+               break;
 
-         case Analyzer.LIST_ITEM:
-            // If we have a sibling item close it
-            CodeKey tmp2 = (CodeKey)stack.peek(0);
-            if (tmp2 != null && tmp2.type == EVENT_ITEM)
-            {
-               _end(EVENT_ITEM);
-            }
-            _start(EVENT_ITEM, null);
-            break;
+            case Analyzer.LIST_ITEM:
+               // If we have a sibling item close it
+               CodeKey tmp2 = (CodeKey)stack.peek(0);
+               if (tmp2 != null && tmp2.type == EVENT_ITEM)
+               {
+                  _end(EVENT_ITEM);
+               }
+               _start(EVENT_ITEM, null);
+               break;
 
-         case Analyzer.LINK:
-            int bracket = t.value.indexOf(']');
-            if (bracket > 0)
-            {
-               boolean hasEquals = t.value.charAt(0) == '=';
-               if (hasEquals)
+            case Analyzer.LINK:
+               int bracket = t.value.indexOf(']');
+               if (bracket > 0)
                {
-                  // todo add support for the link value which is not used yet
-                  String url = t.value.substring(1, bracket);
-                  String link = t.value.substring(bracket + 1);
-                  _start(EVENT_LINK, url);
+                  boolean hasEquals = t.value.charAt(0) == '=';
+                  if (hasEquals)
+                  {
+                     // todo add support for the link value which is not used yet
+                     String url = t.value.substring(1, bracket);
+                     String link = t.value.substring(bracket + 1);
+                     _start(EVENT_LINK, url);
+                     _end(EVENT_LINK);
+                  }
+               }
+               else
+               {
+                  _start(EVENT_LINK, t.value.substring(1));
                   _end(EVENT_LINK);
                }
-            }
-            else
-            {
-               _start(EVENT_LINK, t.value.substring(1));
-               _end(EVENT_LINK);
-            }
 
-            break;
+               break;
 
-         case Analyzer.TEXT:
-            buffer.append(t.value.charAt(0));
-            break;
+            case Analyzer.TEXT:
+               buffer.append(t.value.charAt(0));
+               break;
 
-         default:
-            throw new IllegalStateException("This should not be possible");
+            default:
+               throw new IllegalStateException("This should not be possible");
          }
       }
 
@@ -284,15 +287,18 @@
    {
       protected int type;
       protected String string;
+
       public CodeKey()
       {
          type = -1;
          string = null;
       }
+
       public int getType()
       {
          return type;
       }
+
       public String getString()
       {
          return string;

Modified: trunk/format/src/main/org/jboss/portal/format/parser/chars/Chars.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/chars/Chars.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/chars/Chars.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.chars;
 
 import java.io.IOException;
@@ -33,23 +34,15 @@
  */
 public interface Chars
 {
-   /**
-    * Append the chars to a Writer.
-    */
+   /** Append the chars to a Writer. */
    void appendTo(Writer writer) throws IOException;
 
-   /**
-    * Get a Reader for the chars.
-    */
+   /** Get a Reader for the chars. */
    Reader getReader();
 
-   /**
-    * Returns how many chars there are.
-    */
+   /** Returns how many chars there are. */
    int length();
 
-   /**
-    * Returns a String made of the chars.
-    */
+   /** Returns a String made of the chars. */
    String toString();
 }

Modified: trunk/format/src/main/org/jboss/portal/format/parser/chars/Filter.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/chars/Filter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/chars/Filter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.chars;
 
 import java.io.IOException;
@@ -26,16 +27,14 @@
 import java.io.Writer;
 
 /**
- * Filter an input stream and produce the result into an output stream.
- * The implementations of this interface must be stateless.
+ * Filter an input stream and produce the result into an output stream. The implementations of this interface must be
+ * stateless.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
 public interface Filter
 {
-   /**
-    * Filters.
-    */
+   /** Filters. */
    void filter(Reader in, Writer out) throws IOException;
 }

Modified: trunk/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/chars/ImmutableChars.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.chars;
 
 import java.io.IOException;

Modified: trunk/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/chars/MutableChars.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.chars;
 
 import java.io.CharArrayReader;
@@ -141,9 +142,11 @@
       {
          MutableChars.this.append(cbuf, off, len);
       }
+
       public void flush() throws IOException
       {
       }
+
       public void close() throws IOException
       {
       }

Modified: trunk/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/chars/StackFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.chars;
 
 import java.io.IOException;

Modified: trunk/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/entity/CharacterEntityReferenceEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.entity;
 
 import org.jboss.portal.format.parser.TextEvent;

Modified: trunk/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/entity/HTML4_0CharacterEntityReferenceParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.entity;
 
 import org.jboss.portal.format.parser.AbstractParser;
@@ -45,7 +46,7 @@
       int previousOffset = startOffset;
 
       // Iterates over all the chars
-      for (int currentOffset = startOffset;currentOffset < endOffset;currentOffset++)
+      for (int currentOffset = startOffset; currentOffset < endOffset; currentOffset++)
       {
          char c = chars[currentOffset];
          String result = EntityTable.FULL.lookup(c);

Modified: trunk/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/entity/XML1_0CharacterEntityReferenceParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.entity;
 
 import org.jboss.portal.format.parser.AbstractParser;
 import org.jboss.portal.format.parser.TextEvent;
 
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.regex.Matcher;
 
 /**
  * Detect XML 1.0 character entity references.
@@ -67,20 +68,24 @@
       private final char[] chars;
       private final int offset;
       private final int length;
+
       public CharSequenceImpl(char[] chars, int offset, int length)
       {
          this.chars = chars;
          this.offset = offset;
          this.length = length;
       }
+
       public int length()
       {
          return length;
       }
+
       public char charAt(int index)
       {
          return chars[offset + index];
       }
+
       public CharSequence subSequence(int start, int end)
       {
          return new CharSequenceImpl(chars, start, end - start);

Modified: trunk/format/src/main/org/jboss/portal/format/parser/html/TagParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/html/TagParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/html/TagParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.html;
 
-import java.util.Iterator;
-
 import org.jboss.portal.format.parser.AbstractParser;
 import org.jboss.portal.format.parser.ParseEvent;
 import org.jboss.portal.format.parser.TextEvent;
@@ -31,6 +30,8 @@
 import org.jboss.portal.format.parser.chars.MutableChars;
 import org.jboss.portal.format.util.Stack;
 
+import java.util.Iterator;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -54,6 +55,7 @@
       {
          return new CloseEvent();
       }
+
       protected boolean equals(Stack.Key o1, Stack.Key o2)
       {
          HTMLKey key1 = (HTMLKey)o1;
@@ -104,46 +106,46 @@
 
          switch (t.type)
          {
-         case Analyzer.STAG:
-         {
-            closeEvent = (CloseEvent)stack.push();
-            String tag = t.value;
-            int start = 1;
-            int end = tag.indexOf(' ', 1);
-            if (end == -1)
+            case Analyzer.STAG:
             {
-               openEvent.type = closeEvent.type = EVENT_TAG;
-               openEvent.tag = closeEvent.tag = tag.substring(start, tag.length() - 1);
-               openEvent.attributes = "";
+               closeEvent = (CloseEvent)stack.push();
+               String tag = t.value;
+               int start = 1;
+               int end = tag.indexOf(' ', 1);
+               if (end == -1)
+               {
+                  openEvent.type = closeEvent.type = EVENT_TAG;
+                  openEvent.tag = closeEvent.tag = tag.substring(start, tag.length() - 1);
+                  openEvent.attributes = "";
+               }
+               else
+               {
+                  openEvent.type = closeEvent.type = EVENT_TAG;
+                  openEvent.tag = closeEvent.tag = tag.substring(start, end);
+                  openEvent.attributes = tag.substring(end, tag.length() - 1);
+               }
+               text();
+               handler.handle(openEvent);
+               break;
             }
-            else
+            case Analyzer.ETAG:
             {
-               openEvent.type = closeEvent.type = EVENT_TAG;
-               openEvent.tag = closeEvent.tag = tag.substring(start, end);
-               openEvent.attributes = tag.substring(end, tag.length() - 1);
-            }
-            text();
-            handler.handle(openEvent);
-            break;
-         }
-         case Analyzer.ETAG:
-         {
-            temporaryKey.type = 1;
-            temporaryKey.tag = t.value.substring(2, t.value.length() - 1);
-            Iterator i = stack.pop(temporaryKey);
-            if (i.hasNext())
-            {
-               text();
-               do
+               temporaryKey.type = 1;
+               temporaryKey.tag = t.value.substring(2, t.value.length() - 1);
+               Iterator i = stack.pop(temporaryKey);
+               if (i.hasNext())
                {
-                  handler.handle((CloseEvent)i.next());
+                  text();
+                  do
+                  {
+                     handler.handle((CloseEvent)i.next());
+                  }
+                  while (i.hasNext());
                }
-               while (i.hasNext());
+               break;
             }
-            break;
-         }
-         case Analyzer.EMPTY:
-         {
+            case Analyzer.EMPTY:
+            {
 //               String tag = t.value;
 //               int start = 1;
 //               int end = tag.indexOf(' ', 1);
@@ -153,14 +155,14 @@
 //               }
 //               String name = tag.substring(start, end);
 //               helper.empty(1, name);
-            break;
+               break;
+            }
+            case Analyzer.CDATA:
+               buffer.append(t.value.charAt(0));
+               break;
+            default:
+               throw new IllegalStateException("Unexpected token : " + t.type);
          }
-         case Analyzer.CDATA:
-            buffer.append(t.value.charAt(0));
-            break;
-         default:
-            throw new IllegalStateException("Unexpected token : " + t.type);
-         }
       }
 
       //
@@ -187,15 +189,18 @@
    {
       int type;
       String tag;
+
       private HTMLKey()
       {
          type = -1;
          tag = null;
       }
+
       public int getType()
       {
          return type;
       }
+
       public String getTag()
       {
          return tag;
@@ -205,6 +210,7 @@
    public static class OpenEvent extends HTMLKey implements ParseEvent
    {
       private String attributes;
+
       public String getAttribute()
       {
          return attributes;

Modified: trunk/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/parser/linebreak/LineBreakParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.parser.linebreak;
 
 import org.jboss.portal.format.parser.AbstractParser;
@@ -42,7 +43,7 @@
    {
       int endOffset = startOffset + length;
       int previousOffset = startOffset;
-      for (int currentOffset = startOffset;currentOffset < endOffset;currentOffset++)
+      for (int currentOffset = startOffset; currentOffset < endOffset; currentOffset++)
       {
          char c = chars[currentOffset];
          if (c == '\n')

Modified: trunk/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/render/AbstractRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.render;
 
+import org.apache.log4j.Logger;
+
 import java.io.IOException;
 import java.io.Writer;
 
-import org.apache.log4j.Logger;
-
-/**
- * An abstract renderer.
- */
+/** An abstract renderer. */
 public abstract class AbstractRenderer
 {
-   
 
+
    /** The logger. */
    protected final Logger log = Logger.getLogger(getClass());
 
@@ -44,22 +43,19 @@
 
 
    /** Render. */
-   public void render(String string) {
+   public void render(String string)
+   {
       char[] tmp = string.toCharArray();
       render(tmp, 0, tmp.length);
    }
-   
-   /**
-    * Set the write that will hold the rendered result.
-    */
+
+   /** Set the write that will hold the rendered result. */
    public final void setWriter(Writer writer)
    {
       this.writer = writer;
    }
 
-   /**
-    * Helper method that catch any IOException throw by the write.
-    */
+   /** Helper method that catch any IOException throw by the write. */
    protected final void write(String s)
    {
       try
@@ -72,9 +68,7 @@
       }
    }
 
-   /**
-    * @see #write(java.lang.String)
-    */
+   /** @see #write(java.lang.String) */
    protected final void write(char[] chars, int offset, int length)
    {
       try
@@ -86,8 +80,6 @@
          log.error("Cannot write to output", e);
       }
    }
-   
-   
-   
-   
+
+
 }

Modified: trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLConfig.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.render.bbcodehtml;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.log4j.Logger;
 import org.jboss.portal.format.template.BuildException;
 import org.jboss.portal.format.template.Template;
@@ -32,14 +30,15 @@
 import org.jboss.portal.format.util.CLLoader;
 import org.jboss.portal.format.util.Loader;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  */
 public class ToHTMLConfig
 {
 
-   /**
-    * Template name constants.
-    */
+   /** Template name constants. */
 
    public static final String TPL_THEME_CODE_B_CLOSE = "b_close";
    public static final String TPL_THEME_CODE_B_OPEN = "b_open";
@@ -127,24 +126,24 @@
    }
 
    public void setTags(Set tags)
-    {
-       this.tags = tags;
-    }
+   {
+      this.tags = tags;
+   }
 
-    public Set getTags()
-    {
-       return tags;
-    }
+   public Set getTags()
+   {
+      return tags;
+   }
 
-    public int getFilterMode()
-    {
-       return filterMode;
-    }
+   public int getFilterMode()
+   {
+      return filterMode;
+   }
 
-    public void setFilterMode(int filterMode)
-    {
-       this.filterMode = filterMode;
-    }
+   public void setFilterMode(int filterMode)
+   {
+      this.filterMode = filterMode;
+   }
 
    public int getOuputMode()
    {
@@ -160,14 +159,14 @@
    {
       switch (filterMode)
       {
-      case FILTER_MODE_NEVER_PRINT:
-         return false;
-      case FILTER_MODE_PRINT_IF_NOT_IN_TAGS:
-         return !tags.contains(tag);
-      case FILTER_MODE_PRINT_IF_IN_TAGS:
-         return tags.contains(tag);
-      case FILTER_MODE_ALWAYS_PRINT:
-         return true;
+         case FILTER_MODE_NEVER_PRINT:
+            return false;
+         case FILTER_MODE_PRINT_IF_NOT_IN_TAGS:
+            return !tags.contains(tag);
+         case FILTER_MODE_PRINT_IF_IN_TAGS:
+            return tags.contains(tag);
+         case FILTER_MODE_ALWAYS_PRINT:
+            return true;
       }
       return false;
    }

Modified: trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToHTMLRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.render.bbcodehtml;
 
 import org.jboss.portal.format.parser.ParseEvent;
@@ -37,7 +38,6 @@
 
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -67,9 +67,7 @@
     * Templates.
     */
 
-   /**
-    * Setup the renderer with the given template repository.
-    */
+   /** Setup the renderer with the given template repository. */
    public ToHTMLRenderer(ToHTMLConfig config, ResourceBundle bundle)
    {
       if (config == null)
@@ -121,57 +119,57 @@
             String string = openEvent.getString();
             switch (openEvent.getType())
             {
-            case BBCodeParser.EVENT_BOLD:
-               config.r_b_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_ITALIC:
-               config.r_i_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_UNDERLINE:
-               config.r_u_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_COLOR:
-               ctx.put("COLOR", string);
-               config.r_color_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_SIZE:
-               ctx.put("SIZE", string);
-               config.r_size_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_QUOTE:
-               if (string == null)
-               {
-                  config.r_quote_open.render(ctx, writer);
-               }
-               else
-               {
-                  ctx.put("USERNAME", string);
-                  config.r_quote_username_open.render(ctx, writer);
-               }
-               break;
-            case BBCodeParser.EVENT_CODE:
-               isInPre++;
-               config.r_code_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_UNORDERED_LIST:
-               config.r_ulist_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
-               ctx.put("LIST_TYPE", "1");
-               config.r_olist_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
-               ctx.put("LIST_TYPE", "a");
-               config.r_olist_open.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_ITEM:
-               config.r_listitem.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_LINK:
-               ctx.put("URL", string);
-               ctx.put("DESCRIPTION", string);
-               config.r_url.render(ctx, writer);
-               break;
+               case BBCodeParser.EVENT_BOLD:
+                  config.r_b_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_ITALIC:
+                  config.r_i_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_UNDERLINE:
+                  config.r_u_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_COLOR:
+                  ctx.put("COLOR", string);
+                  config.r_color_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_SIZE:
+                  ctx.put("SIZE", string);
+                  config.r_size_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_QUOTE:
+                  if (string == null)
+                  {
+                     config.r_quote_open.render(ctx, writer);
+                  }
+                  else
+                  {
+                     ctx.put("USERNAME", string);
+                     config.r_quote_username_open.render(ctx, writer);
+                  }
+                  break;
+               case BBCodeParser.EVENT_CODE:
+                  isInPre++;
+                  config.r_code_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_UNORDERED_LIST:
+                  config.r_ulist_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
+                  ctx.put("LIST_TYPE", "1");
+                  config.r_olist_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
+                  ctx.put("LIST_TYPE", "a");
+                  config.r_olist_open.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_ITEM:
+                  config.r_listitem.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_LINK:
+                  ctx.put("URL", string);
+                  ctx.put("DESCRIPTION", string);
+                  config.r_url.render(ctx, writer);
+                  break;
             }
          }
          else if (event instanceof BBCodeParser.CloseEvent)
@@ -179,41 +177,41 @@
             BBCodeParser.CloseEvent closeEvent = (BBCodeParser.CloseEvent)event;
             switch (closeEvent.getType())
             {
-            case BBCodeParser.EVENT_BOLD:
-               config.r_b_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_ITALIC:
-               config.r_i_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_UNDERLINE:
-               config.r_u_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_COLOR:
-               config.r_color_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_SIZE:
-               config.r_size_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_QUOTE:
-               config.r_quote_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_CODE:
-               isInPre--;
-               config.r_code_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_UNORDERED_LIST:
-               config.r_ulist_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
-               config.r_olist_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
-               config.r_olist_close.render(ctx, writer);
-               break;
-            case BBCodeParser.EVENT_ITEM:
-               break;
-            case BBCodeParser.EVENT_LINK:
-               break;
+               case BBCodeParser.EVENT_BOLD:
+                  config.r_b_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_ITALIC:
+                  config.r_i_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_UNDERLINE:
+                  config.r_u_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_COLOR:
+                  config.r_color_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_SIZE:
+                  config.r_size_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_QUOTE:
+                  config.r_quote_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_CODE:
+                  isInPre--;
+                  config.r_code_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_UNORDERED_LIST:
+                  config.r_ulist_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
+                  config.r_olist_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
+                  config.r_olist_close.render(ctx, writer);
+                  break;
+               case BBCodeParser.EVENT_ITEM:
+                  break;
+               case BBCodeParser.EVENT_LINK:
+                  break;
             }
          }
          else
@@ -240,27 +238,27 @@
             TagParser.OpenEvent openEvent = (TagParser.OpenEvent)event;
             switch (openEvent.getType())
             {
-            case TagParser.EVENT_TAG:
-               String tag = openEvent.getTag();
-               if (config.print(tag))
-               {
-                  if ("pre".equals(tag))
+               case TagParser.EVENT_TAG:
+                  String tag = openEvent.getTag();
+                  if (config.print(tag))
                   {
-                     isInPre++;
+                     if ("pre".equals(tag))
+                     {
+                        isInPre++;
+                     }
+                     write("<");
+                     write(tag);
+                     write(openEvent.getAttribute());
+                     write(">");
                   }
-                  write("<");
-                  write(tag);
-                  write(openEvent.getAttribute());
-                  write(">");
-               }
-               else if (config.getOuputMode() == ToHTMLConfig.OUTPUT_MODE_DISPLAY)
-               {
-                  write("&lt;");
-                  write(tag);
-                  write(openEvent.getAttribute());
-                  write("&gt;");
-               }
-               break;
+                  else if (config.getOuputMode() == ToHTMLConfig.OUTPUT_MODE_DISPLAY)
+                  {
+                     write("&lt;");
+                     write(tag);
+                     write(openEvent.getAttribute());
+                     write("&gt;");
+                  }
+                  break;
             }
          }
          else if (event instanceof TagParser.CloseEvent)
@@ -268,25 +266,25 @@
             TagParser.CloseEvent closeEvent = (TagParser.CloseEvent)event;
             switch (closeEvent.getType())
             {
-            case TagParser.EVENT_TAG:
-               String tag = closeEvent.getTag();
-               if (config.print(tag))
-               {
-                  if ("pre".equals(tag))
+               case TagParser.EVENT_TAG:
+                  String tag = closeEvent.getTag();
+                  if (config.print(tag))
                   {
-                     isInPre--;
+                     if ("pre".equals(tag))
+                     {
+                        isInPre--;
+                     }
+                     write("</");
+                     write(tag);
+                     write(">");
                   }
-                  write("</");
-                  write(tag);
-                  write(">");
-               }
-               else if (config.getOuputMode() == ToHTMLConfig.OUTPUT_MODE_DISPLAY)
-               {
-                  write("&lt;/");
-                  write(tag);
-                  write("&gt;");
-               }
-               break;
+                  else if (config.getOuputMode() == ToHTMLConfig.OUTPUT_MODE_DISPLAY)
+                  {
+                     write("&lt;/");
+                     write(tag);
+                     write("&gt;");
+                  }
+                  break;
             }
          }
          else

Modified: trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/render/bbcodehtml/ToTextRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.render.bbcodehtml;
 
 import org.jboss.portal.format.parser.ParseEvent;
@@ -30,12 +31,11 @@
 import org.jboss.portal.format.render.AbstractRenderer;
 
 /**
- * 
  * @author <a href="mailto:julien at jboss.org">Julien Viet </a>
  * @version $Revision$
  */
 public class ToTextRenderer
-      extends AbstractRenderer
+   extends AbstractRenderer
 {
 
    private final String PRECEDE_CODE = "  | ";
@@ -74,106 +74,110 @@
       {
          if (event instanceof BBCodeParser.OpenEvent)
          {
-            BBCodeParser.OpenEvent openEvent = (BBCodeParser.OpenEvent) event;
+            BBCodeParser.OpenEvent openEvent = (BBCodeParser.OpenEvent)event;
             String string = openEvent.getString();
             switch (openEvent.getType())
             {
-            case BBCodeParser.EVENT_BOLD:
-               if (isInCode == 0)
-                  write("*");
-               break;
-            case BBCodeParser.EVENT_ITALIC:
-               break;
-            case BBCodeParser.EVENT_UNDERLINE:
-               break;
-            case BBCodeParser.EVENT_COLOR:
-               break;
-            case BBCodeParser.EVENT_SIZE:
-               break;
-            case BBCodeParser.EVENT_QUOTE:
-               indentLevel++;
-               write(string != null ? string : "anonymous");
-               write(" wrote : ");
-               break;
-            case BBCodeParser.EVENT_CODE:
-               isInCode++;
-               indentLevel++;
-               int count = indentLevel;
-               while (count-- > 0)
-               {
-                  write(PRECEDE_CODE);
-               }
-               break;
-            case BBCodeParser.EVENT_UNORDERED_LIST:
-               indentLevel++;
-               break;
-            case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
-               indentLevel++;
-               break;
-            case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
-               indentLevel++;
-               break;
-            case BBCodeParser.EVENT_ITEM:
-               write("-> ");
-               break;
-            case BBCodeParser.EVENT_LINK:
-               write("[ " + string);
-               break;
+               case BBCodeParser.EVENT_BOLD:
+                  if (isInCode == 0)
+                  {
+                     write("*");
+                  }
+                  break;
+               case BBCodeParser.EVENT_ITALIC:
+                  break;
+               case BBCodeParser.EVENT_UNDERLINE:
+                  break;
+               case BBCodeParser.EVENT_COLOR:
+                  break;
+               case BBCodeParser.EVENT_SIZE:
+                  break;
+               case BBCodeParser.EVENT_QUOTE:
+                  indentLevel++;
+                  write(string != null ? string : "anonymous");
+                  write(" wrote : ");
+                  break;
+               case BBCodeParser.EVENT_CODE:
+                  isInCode++;
+                  indentLevel++;
+                  int count = indentLevel;
+                  while (count-- > 0)
+                  {
+                     write(PRECEDE_CODE);
+                  }
+                  break;
+               case BBCodeParser.EVENT_UNORDERED_LIST:
+                  indentLevel++;
+                  break;
+               case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
+                  indentLevel++;
+                  break;
+               case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
+                  indentLevel++;
+                  break;
+               case BBCodeParser.EVENT_ITEM:
+                  write("-> ");
+                  break;
+               case BBCodeParser.EVENT_LINK:
+                  write("[ " + string);
+                  break;
             }
          }
          else if (event instanceof BBCodeParser.CloseEvent)
          {
-            BBCodeParser.CloseEvent closeEvent = (BBCodeParser.CloseEvent) event;
+            BBCodeParser.CloseEvent closeEvent = (BBCodeParser.CloseEvent)event;
             String string = closeEvent.getString();
             switch (closeEvent.getType())
             {
-            case BBCodeParser.EVENT_BOLD:
-               if (isInCode == 0)
-                  write("*");
-               break;
-            case BBCodeParser.EVENT_ITALIC:
-               break;
-            case BBCodeParser.EVENT_UNDERLINE:
-               break;
-            case BBCodeParser.EVENT_COLOR:
-               break;
-            case BBCodeParser.EVENT_SIZE:
-               break;
-            case BBCodeParser.EVENT_QUOTE:
-               indentLevel--;
-               break;
-            case BBCodeParser.EVENT_CODE:
-               isInCode--;
-               indentLevel--;
-               break;
-            case BBCodeParser.EVENT_UNORDERED_LIST:
-               indentLevel--;
-               break;
-            case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
-               indentLevel--;
-               break;
-            case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
-               indentLevel--;
-               break;
-            case BBCodeParser.EVENT_ITEM:
-               break;
-            case BBCodeParser.EVENT_LINK:
-               write(" ]");
-               break;
+               case BBCodeParser.EVENT_BOLD:
+                  if (isInCode == 0)
+                  {
+                     write("*");
+                  }
+                  break;
+               case BBCodeParser.EVENT_ITALIC:
+                  break;
+               case BBCodeParser.EVENT_UNDERLINE:
+                  break;
+               case BBCodeParser.EVENT_COLOR:
+                  break;
+               case BBCodeParser.EVENT_SIZE:
+                  break;
+               case BBCodeParser.EVENT_QUOTE:
+                  indentLevel--;
+                  break;
+               case BBCodeParser.EVENT_CODE:
+                  isInCode--;
+                  indentLevel--;
+                  break;
+               case BBCodeParser.EVENT_UNORDERED_LIST:
+                  indentLevel--;
+                  break;
+               case BBCodeParser.EVENT_NUMERICALLY_ORDERED_LIST:
+                  indentLevel--;
+                  break;
+               case BBCodeParser.EVENT_ALPHABETICALLY_ORDERED_LIST:
+                  indentLevel--;
+                  break;
+               case BBCodeParser.EVENT_ITEM:
+                  break;
+               case BBCodeParser.EVENT_LINK:
+                  write(" ]");
+                  break;
             }
          }
          else
          {
-            TextEvent textEvent = (TextEvent) event;
+            TextEvent textEvent = (TextEvent)event;
             if (isInCode > 0)
             {
                lineBreakParser.parse(textEvent.chars(), textEvent.offset(),
-                     textEvent.length());
+                  textEvent.length());
             }
             else
             {
                tagParser.parse(textEvent.chars(), textEvent.offset(), textEvent
-                     .length());
+                  .length());
             }
          }
       }
@@ -203,9 +207,9 @@
          }
          else
          {
-            TextEvent textEvent = (TextEvent) event;
+            TextEvent textEvent = (TextEvent)event;
             lineBreakParser.parse(textEvent.chars(), textEvent.offset(),
-                  textEvent.length());
+               textEvent.length());
          }
       }
    };
@@ -218,7 +222,7 @@
       {
          if (event instanceof TextEvent)
          {
-            TextEvent textEvent = (TextEvent) event;
+            TextEvent textEvent = (TextEvent)event;
             write(textEvent.chars(), textEvent.offset(), textEvent.length());
 
             // this code perform wrapping but is not used now because

Modified: trunk/format/src/main/org/jboss/portal/format/template/AbstractContext.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/AbstractContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/AbstractContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
 import java.util.Iterator;
@@ -33,10 +34,12 @@
    {
       throw new UnsupportedOperationException();
    }
+
    public String get(String o)
    {
       throw new UnsupportedOperationException();
    }
+
    public Context put(String key, String value)
    {
       throw new UnsupportedOperationException();

Modified: trunk/format/src/main/org/jboss/portal/format/template/BuildException.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/BuildException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/BuildException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
 import org.jboss.util.NestedException;

Modified: trunk/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/ChildrenStrategy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
 import java.util.Collections;

Modified: trunk/format/src/main/org/jboss/portal/format/template/Context.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/Context.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/Context.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
 import java.util.Collections;
@@ -33,30 +34,29 @@
 {
    /** null context */
    Context NULL_CONTEXT = new AbstractContext()
+   {
+      final Iterator it = Collections.EMPTY_LIST.iterator();
+
+      public Iterator childIterator(String name)
       {
-         final Iterator it = Collections.EMPTY_LIST.iterator();
+         return it;
+      }
 
-         public Iterator childIterator(String name)
-         {
-            return it;
-         }
+      public String get(String key)
+      {
+         return "";
+      }
 
-         public String get(String key)
-         {
-            return "";
-         }
+      public Context put(String key, String value)
+      {
+         return this;
+      }
+   };
 
-         public Context put(String key, String value)
-         {
-            return this;
-         }
-      };
-
    /**
     * get the template data from the context
     *
     * @param key template variable name
-    *
     * @return template value
     */
    public String get(String key);
@@ -64,9 +64,8 @@
    /**
     * add data to be rendered in the template through variable substitution
     *
-    * @param key template variable name
+    * @param key   template variable name
     * @param value value to render in template
-    *
     * @return context to place data into
     */
    public Context put(String key, String value);
@@ -75,7 +74,6 @@
     * get an iterator for the nested/loop data contexts
     *
     * @param name template variable prefix name
-    *
     * @return iterator for the children
     */
    Iterator childIterator(String name);

Modified: trunk/format/src/main/org/jboss/portal/format/template/DelegateContext.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/DelegateContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/DelegateContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
 import java.util.HashMap;
@@ -38,9 +39,7 @@
    /** template name/value pairs for substitution */
    private Map delegate;
 
-   /**
-    * creates a new DelegateContext object.
-    */
+   /** creates a new DelegateContext object. */
    public DelegateContext()
    {
       this(new HashMap(), new HashMap());
@@ -59,11 +58,9 @@
    }
 
    /**
-    * create a new "root" data context and name/value pairs to be used as
-    * nested or loop data
+    * create a new "root" data context and name/value pairs to be used as nested or loop data
     *
     * @param children name/value pairs for nested or loop data
-    *
     * @return context to continue adding template data too
     */
    public static final DelegateContext createWithChildren(Map children)
@@ -75,7 +72,6 @@
     * create a new data context with already existing name/value pairs
     *
     * @param values existing name/value pair map
-    *
     * @return context to continue adding template data too
     */
    public static final DelegateContext createWithValues(Map values)
@@ -84,41 +80,33 @@
    }
 
    /**
-    * add an existing data context into this context for use in template loops
-    * or nested template data.
+    * add an existing data context into this context for use in template loops or nested template data.
     *
     * @param name variable prefix name
-    * @param ctx context to add
+    * @param ctx  context to add
     */
    public void append(String name, Context ctx)
    {
       children.append(name, ctx);
    }
 
-   /**
-    * @see org.jboss.portal.format.template.Context#childIterator(java.lang.String)
-    */
+   /** @see org.jboss.portal.format.template.Context#childIterator(java.lang.String) */
    public Iterator childIterator(String name)
    {
       return children.childIterator(name);
    }
 
-   /**
-    * @see org.jboss.portal.format.template.Context#get(java.lang.String)
-    */
+   /** @see org.jboss.portal.format.template.Context#get(java.lang.String) */
    public String get(String key)
    {
-      return (String) delegate.get(key);
+      return (String)delegate.get(key);
    }
 
    /**
-    * create a new object to place data for use in template loops or nested
-    * template data. tpl var format: 
-    * { prefix.VAR_NAME
-    * }
+    * create a new object to place data for use in template loops or nested template data. tpl var format: {
+    * prefix.VAR_NAME }
     *
     * @param name variable prefix name
-    *
     * @return delegate context that will contain the loop or nested data
     */
    public DelegateContext next(String name)
@@ -129,10 +117,7 @@
       return ctx;
    }
 
-   /**
-    * @see org.jboss.portal.format.template.Context#put(java.lang.String,
-    *      java.lang.String)
-    */
+   /** @see org.jboss.portal.format.template.Context#put(java.lang.String,java.lang.String) */
    public Context put(String key, String value)
    {
       delegate.put(key, value);

Modified: trunk/format/src/main/org/jboss/portal/format/template/Template.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/Template.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/Template.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
+import org.apache.log4j.Logger;
+
 import java.io.StringWriter;
 import java.io.Writer;
 
-import org.apache.log4j.Logger;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- */
+/** @author <a href="mailto:julien at jboss.org">Julien Viet</a> */
 public abstract class Template
 {
 
@@ -53,9 +52,7 @@
       return local;
    }
 
-   /**
-    * This may be subclassed.
-    */
+   /** This may be subclassed. */
    public void render(Context ctx, Writer writer)
    {
    }

Modified: trunk/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/TemplateBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
 import javassist.CannotCompileException;
 import javassist.ClassPool;
 import javassist.CtClass;
@@ -36,16 +32,18 @@
 import javassist.LoaderClassPath;
 import javassist.Modifier;
 import javassist.NotFoundException;
-
 import org.apache.log4j.Logger;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Node;
 import org.dom4j.Text;
 
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- */
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Set;
+
+/** @author <a href="mailto:julien at jboss.org">Julien Viet</a> */
 public class TemplateBuilder
 {
 
@@ -102,11 +100,11 @@
          addConstructor();
          implementRender();
       }
-      catch(CannotCompileException e)
+      catch (CannotCompileException e)
       {
          throw new BuildException("Unexpected error, cannot build template", e);
       }
-      catch(NotFoundException e)
+      catch (NotFoundException e)
       {
          throw new BuildException("Unexpected error, cannot build template", e);
       }
@@ -126,8 +124,8 @@
       stack.add("");
       StringBuffer buffer = new StringBuffer();
       buffer.append("public void render(").append(Context.class.getName()).append(" ctx, ").append(Writer.class.getName()).append(" writer)\n").
-             append("{\n").
-             append("   ").append(CONTEXT).append(" ctx_ = $1;\n");
+         append("{\n").
+         append("   ").append(CONTEXT).append(" ctx_ = $1;\n");
       generateRender(stack, buffer, "   ", node);
       buffer.append("}\n");
       String code = buffer.toString();
@@ -143,7 +141,7 @@
    private void generateRender(LinkedList stack, StringBuffer buffer, String indent, Element node)
    {
       buffer.append(indent).append("String s_").append(stack.size()).append(" = null;\n");
-      for (Iterator i = node.content().iterator();i.hasNext();)
+      for (Iterator i = node.content().iterator(); i.hasNext();)
       {
          Node item = (Node)i.next();
          if (item instanceof Text)
@@ -162,10 +160,10 @@
                String iterator = "it_" + name;
                String context = "ctx_" + name;
                buffer.append(indent).append("for (").append(ITERATOR).append(" ").append(iterator).append(" = ").append("ctx_").append(stack.getLast()).append(".childIterator(\"").append(name).append("\");").
-                                      append(iterator).append(".hasNext();").
-                                      append(")\n").
-                      append(indent).append("{\n").
-                      append(indent).append("   ").append(CONTEXT).append(" ").append(context).append(" = (").append(CONTEXT).append(")").append(iterator).append(".next();\n");
+                  append(iterator).append(".hasNext();").
+                  append(")\n").
+                  append(indent).append("{\n").
+                  append(indent).append("   ").append(CONTEXT).append(" ").append(context).append(" = (").append(CONTEXT).append(")").append(iterator).append(".next();\n");
                stack.add(name);
                generateRender(stack, buffer, indent + "   ", elt.element("node"));
                stack.removeLast();
@@ -178,7 +176,7 @@
                String target = null;
                if (depth == 0)
                {
-                  target = propertyNames.contains(name)  ? "$0.local" : "ctx_";
+                  target = propertyNames.contains(name) ? "$0.local" : "ctx_";
                }
                else
                {
@@ -187,14 +185,14 @@
                if (target != null)
                {
                   buffer.append(indent).append("s_").append(stack.size()).append(" = (java.lang.String)").append(target).append(".get(\"").append(name).append("\");\n").
-                         append(indent).append("if (s_").append(stack.size()).append(" != null)\n").
-                         append(indent).append("{\n").
-                         append(indent).append("   $2.write(s_").append(stack.size()).append(");\n").
-                         append(indent).append("}\n").
-                         append(indent).append("else if (log.isDebugEnabled())\n").
-                         append(indent).append("{\n").
-                         append(indent).append("   log.debug(\"field ").append(name).append(" is null\");\n").
-                         append(indent).append("}\n");
+                     append(indent).append("if (s_").append(stack.size()).append(" != null)\n").
+                     append(indent).append("{\n").
+                     append(indent).append("   $2.write(s_").append(stack.size()).append(");\n").
+                     append(indent).append("}\n").
+                     append(indent).append("else if (log.isDebugEnabled())\n").
+                     append(indent).append("{\n").
+                     append(indent).append("   log.debug(\"field ").append(name).append(" is null\");\n").
+                     append(indent).append("}\n");
                }
                else
                {

Modified: trunk/format/src/main/org/jboss/portal/format/template/TemplateLoader.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/TemplateLoader.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/TemplateLoader.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
+import org.dom4j.Document;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.format.util.CLLoader;
+import org.jboss.portal.format.util.Loader;
+
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Set;
 
-import org.dom4j.Document;
-import org.jboss.portal.format.util.CLLoader;
-import org.jboss.portal.format.util.Loader;
-import org.jboss.portal.common.util.Tools;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -137,9 +138,7 @@
 //      }
 //   }
 
-   /**
-    * Simply loads a template and returns it.
-    */
+   /** Simply loads a template and returns it. */
    public Document loadTemplate(String name) throws BuildException
    {
       InputStream tin = null;
@@ -157,7 +156,7 @@
             throw new BuildException("Template " + name + " not found");
          }
       }
-      catch(ParseException e)
+      catch (ParseException e)
       {
          throw new BuildException("Cannot parse the template source " + name, e);
       }

Modified: trunk/format/src/main/org/jboss/portal/format/template/TemplateParser.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/TemplateParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/TemplateParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
+import org.dom4j.Document;
+import org.dom4j.DocumentFactory;
+import org.dom4j.Element;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
@@ -29,13 +34,7 @@
 import java.io.StringReader;
 import java.util.LinkedList;
 
-import org.dom4j.Document;
-import org.dom4j.DocumentFactory;
-import org.dom4j.Element;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- */
+/** @author <a href="mailto:julien at jboss.org">Julien Viet</a> */
 public final class TemplateParser
    implements TemplateAnalyzerConstants
 {
@@ -65,13 +64,10 @@
       current = template.addElement("node");
    }
 
-   /**
-    * This method should be called only once. If it is called more than once
-    * there are no garanty on the result.
-    */
+   /** This method should be called only once. If it is called more than once there are no garanty on the result. */
    public Document parse() throws ParseException
    {
-      while(true)
+      while (true)
       {
          // getChild the next token
          Token t = analyzer.getNextToken();
@@ -92,80 +88,80 @@
             return template;
          }
 
-         switch(t.kind)
+         switch (t.kind)
          {
-         case BEGIN:
-            if (text != null)
-            {
-               current.addText(text.toString());
-               text = null;
-            }
-            Element loop = current.addElement("loop");
-            loop.addAttribute("name", t.image.substring("<!-- BEGIN ".length(), t.image.length() - " -->".length()));
-            push(loop.addElement("node"));
-            break;
+            case BEGIN:
+               if (text != null)
+               {
+                  current.addText(text.toString());
+                  text = null;
+               }
+               Element loop = current.addElement("loop");
+               loop.addAttribute("name", t.image.substring("<!-- BEGIN ".length(), t.image.length() - " -->".length()));
+               push(loop.addElement("node"));
+               break;
 
-         case END:
-            if (text != null)
-            {
-               current.addText(text.toString());
-               text = null;
-            }
-            if (!"node".equals(current.getName()))
-            {
-               throw new ParseException("Unexpected closing loop");
-            }
-            pop();
+            case END:
+               if (text != null)
+               {
+                  current.addText(text.toString());
+                  text = null;
+               }
+               if (!"node".equals(current.getName()))
+               {
+                  throw new ParseException("Unexpected closing loop");
+               }
+               pop();
 //            if (!((Loop)current.getContent().getLast()).validate(t.image))
 //            {
 //               throw new ParseException("Closing loop does not match");
 //            }
-            break;
+               break;
 
-         case PROPERTY:
-         case TEXT:
-            if (text == null)
-            {
-               text = new StringBuffer();
-            }
-            text.append(t.image);
-            break;
-         case NEWLINE:
-            if (text == null)
-            {
-               text = new StringBuffer();
-            }
-            text.append("\n");
-            break;
+            case PROPERTY:
+            case TEXT:
+               if (text == null)
+               {
+                  text = new StringBuffer();
+               }
+               text.append(t.image);
+               break;
+            case NEWLINE:
+               if (text == null)
+               {
+                  text = new StringBuffer();
+               }
+               text.append("\n");
+               break;
 
 
-         case REF:
-            if (text != null)
-            {
-               current.addText(text.toString());
-               text = null;
-            }
-            Element ref = current.addElement("ref");
-            String tmp = t.image.substring(1, t.image.length() - 1);
-            int count = 0;
-            int previous = -1;
-            while (true)
-            {
-               int index = tmp.indexOf('.', previous + 1);
-               if (index == -1)
+            case REF:
+               if (text != null)
                {
-                  String name = tmp.substring(previous + 1);
-                  ref.addAttribute("name", name);
-                  break;
+                  current.addText(text.toString());
+                  text = null;
                }
-               count++;
-               previous = index;
-            }
-            ref.addAttribute("depth", "" + count);
-            break;
+               Element ref = current.addElement("ref");
+               String tmp = t.image.substring(1, t.image.length() - 1);
+               int count = 0;
+               int previous = -1;
+               while (true)
+               {
+                  int index = tmp.indexOf('.', previous + 1);
+                  if (index == -1)
+                  {
+                     String name = tmp.substring(previous + 1);
+                     ref.addAttribute("name", name);
+                     break;
+                  }
+                  count++;
+                  previous = index;
+               }
+               ref.addAttribute("depth", "" + count);
+               break;
 
-         default:
-            throw new ParseException("Unexpected token");
+            default:
+               throw new ParseException("Unexpected token");
          }
       }
    }

Modified: trunk/format/src/main/org/jboss/portal/format/template/TemplateRepository.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/TemplateRepository.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/TemplateRepository.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
+import javassist.CannotCompileException;
+import javassist.CtClass;
+import org.apache.log4j.Logger;
+import org.dom4j.Document;
+import org.dom4j.Element;
+
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.util.Collection;
@@ -29,16 +36,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javassist.CannotCompileException;
-import javassist.CtClass;
-
-import org.apache.log4j.Logger;
-import org.dom4j.Document;
-import org.dom4j.Element;
-
-/**
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
- */
+/** @author <a href="mailto:julien at jboss.org">Julien Viet</a> */
 public class TemplateRepository
 {
 
@@ -65,8 +63,9 @@
 
    /**
     * Creates a new template instance.
+    *
     * @param name the template name
-    * @param ctx the context with the template properties
+    * @param ctx  the context with the template properties
     * @return the template instance or null if it is not found
     */
    public Template createTemplate(String name, Context ctx)
@@ -77,7 +76,7 @@
          Class clazz = (Class)classes.get(name);
          if (clazz != null)
          {
-            Constructor ctor =  clazz.getConstructor(new Class[]{Context.class});
+            Constructor ctor = clazz.getConstructor(new Class[]{Context.class});
             template = (Template)ctor.newInstance(new Object[]{ctx});
          }
          else
@@ -85,7 +84,7 @@
             log.warn("Template " + name + " not found");
          }
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          log.error("Cannot instantiate template " + name, e);
          throw new RuntimeException("An unexpected exception occured during the template instantiation");
@@ -132,7 +131,7 @@
          // Return the class corresponding to the template
          return tcl.loadClass(className);
       }
-      catch(ClassNotFoundException e)
+      catch (ClassNotFoundException e)
       {
          throw new BuildException("Unexpected error, cannot compile template", e);
       }
@@ -171,11 +170,11 @@
             classes.put(cc.getName(), cc.toBytecode());
             return cc.getName();
          }
-         catch(IOException e)
+         catch (IOException e)
          {
             throw new BuildException("Unexpected error cannot compile template", e);
          }
-         catch(CannotCompileException e)
+         catch (CannotCompileException e)
          {
             throw new BuildException("Unexpected error cannot compile template", e);
          }

Modified: trunk/format/src/main/org/jboss/portal/format/template/TemplateUtils.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/template/TemplateUtils.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/template/TemplateUtils.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.template;
 
+import org.apache.log4j.Logger;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
 
-
 /**
  * various methods to assist with using templates
  *
@@ -37,15 +38,13 @@
 public class TemplateUtils
 {
    /**
-    * collect the fields out of any class that match the specified prefix. this
-    * is useful for getting the list of constants whose values represent
-    * template names
+    * collect the fields out of any class that match the specified prefix. this is useful for getting the list of
+    * constants whose values represent template names
     *
-    * @param clazz class to collect fields out from
+    * @param clazz  class to collect fields out from
     * @param prefix prefix to match fields against
-    *
-    * @return 2 dimensional array - first dimension contains number of objects,
-    *         second dimesion contains field name (a[0]) and value (a[1]).
+    * @return 2 dimensional array - first dimension contains number of objects, second dimesion contains field name
+    *         (a[0]) and value (a[1]).
     */
    public static String[][] collectFields(Class clazz, String prefix)
    {
@@ -58,7 +57,7 @@
          int modifier = field.getModifiers();
 
          if (field.getName().startsWith(prefix) && Modifier.isFinal(modifier)
-             && Modifier.isPublic(modifier) && Modifier.isStatic(modifier))
+            && Modifier.isPublic(modifier) && Modifier.isStatic(modifier))
          {
             /*
              * stick the field name and value into a String[] and then
@@ -67,7 +66,7 @@
             try
             {
                values.add(
-                  new String[] { field.getName(), (String) field.get(null) });
+                  new String[]{field.getName(), (String)field.get(null)});
             }
             catch (Exception ignore)
             {
@@ -81,6 +80,6 @@
        * return the the list of String[] objects containing the field
        * name/values as a 2-dimension array
        */
-      return (String[][]) values.toArray(new String[values.size()][]);
+      return (String[][])values.toArray(new String[values.size()][]);
    }
 }

Modified: trunk/format/src/main/org/jboss/portal/format/util/CLLoader.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/util/CLLoader.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/util/CLLoader.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.util;
 
 import java.io.InputStream;

Modified: trunk/format/src/main/org/jboss/portal/format/util/EntityTable.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/util/EntityTable.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/util/EntityTable.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.util;
 
-/**
- * This table provides lookup for converting a char to
- * its HTML entity representation.
- */
+/** This table provides lookup for converting a char to its HTML entity representation. */
 public class EntityTable
 {
 
-   /**
-    * All HTML entities.
-    */
+   /** All HTML entities. */
    public static final EntityTable FULL = new EntityTable();
 
-   /**
-    * All HTML entities except the HTML chars which are used to do HTML itself.
-    */
+   /** All HTML entities except the HTML chars which are used to do HTML itself. */
    public static final EntityTable BASIC = new BasicEntityTable();
 
    private static class BasicEntityTable extends EntityTable
@@ -317,9 +311,7 @@
       charToEntity[c] = null;
    }
 
-   /**
-    * Returns null if no entity is found or return the converted entity.
-    */
+   /** Returns null if no entity is found or return the converted entity. */
    public final String lookup(char c)
    {
       return charToEntity[c];
@@ -337,7 +329,7 @@
       int previous = 0;
 
       // Perform lookup char by char
-      for (int current = 0;current < chars.length;current++)
+      for (int current = 0; current < chars.length; current++)
       {
          // Lookup
          String replacement = lookup(chars[current]);

Modified: trunk/format/src/main/org/jboss/portal/format/util/Loader.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/util/Loader.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/util/Loader.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.util;
 
 import java.io.InputStream;
 
 /**
- * A generic interface which define loading capabilities.
- * The name format must follow the regular expression : ^(/[-a-zA-Z0-9_\.]+)+$
+ * A generic interface which define loading capabilities. The name format must follow the regular expression :
+ * ^(/[-a-zA-Z0-9_\.]+)+$
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -35,8 +36,6 @@
 
    String NAME_VALIDATOR = "^(/[-a-zA-Z0-9_\\.]+)+$";
 
-   /**
-    * Returns an InputStream or null if not found.
-    */
+   /** Returns an InputStream or null if not found. */
    InputStream load(String path);
 }

Modified: trunk/format/src/main/org/jboss/portal/format/util/Stack.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/format/util/Stack.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/format/util/Stack.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.format.util;
 
 import java.util.Collections;
 import java.util.Iterator;
 
 /**
- * The goal of this class is to ensure that any event with open/close
- * well formdness semantics are respected.
- *
+ * The goal of this class is to ensure that any event with open/close well formdness semantics are respected.
+ * <p/>
  * This class maintain a stack of keys.
+ * <p/>
+ * To be operational this class must be subclassed to provide semantics that the user wants to give to the key
+ * identities.
  *
- * To be operational this class must be subclassed to provide semantics
- * that the user wants to give to the key identities.
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -48,29 +48,23 @@
    /** The reusable iterator. */
    private KeyIterator iterator = new KeyIterator();
 
-   /**
-    * Create a new stack with a specified depth.
-    */
+   /** Create a new stack with a specified depth. */
    public Stack(int initalCapacity)
    {
       this.stack = new Key[initalCapacity];
       for (int i = 0; i < stack.length; i++)
       {
-        this.stack[i] = createKey();
+         this.stack[i] = createKey();
       }
    }
 
-   /**
-    * Reset the stack state.
-    */
+   /** Reset the stack state. */
    public final void reset()
    {
       ptr = 0;
    }
 
-   /**
-    * Push a key on the stack.
-    */
+   /** Push a key on the stack. */
    public final Key push()
    {
       if (ptr == stack.length)
@@ -80,24 +74,20 @@
       return stack[ptr++];
    }
 
-   /**
-    * Peek a key on the stack.
-    */
+   /** Peek a key on the stack. */
    public Key peek(int level)
    {
-      level = ptr - 1 - level ;
+      level = ptr - 1 - level;
       return level >= 0 ? stack[level] : null;
    }
 
-   /**
-    * Pop keys until it finds the good one.
-    */
+   /** Pop keys until it finds the good one. */
    public final Iterator pop(Key candidate)
    {
       if (ptr > 0)
       {
          iterator.from = ptr - 1;
-         for (Key key = stack[--ptr];!equals(candidate, key) && ptr >= 1;key = stack[--ptr])
+         for (Key key = stack[--ptr]; !equals(candidate, key) && ptr >= 1; key = stack[--ptr])
          {
             ;
          }
@@ -111,54 +101,47 @@
       }
    }
 
-   /**
-    * The implementation must provide a reusable key.
-    */
+   /** The implementation must provide a reusable key. */
    protected abstract Key createKey();
 
-   /**
-    * The implementation must test keys equality.
-    */
+   /** The implementation must test keys equality. */
    protected abstract boolean equals(Key key1, Key key2);
 
-   /**
-    * Enlarge the key stack. For now it simply add 3 keys to the actual length
-    */
+   /** Enlarge the key stack. For now it simply add 3 keys to the actual length */
    protected void enlarge()
    {
       Key[] tmp = new Key[stack.length + 3];
       System.arraycopy(stack, 0, tmp, 0, stack.length);
-      for (int i = stack.length;i < tmp.length;i++)
+      for (int i = stack.length; i < tmp.length; i++)
       {
          tmp[i] = createKey();
       }
       stack = tmp;
    }
 
-   /**
-    * Iterates over the poped keys.
-    */
+   /** Iterates over the poped keys. */
    public class KeyIterator implements Iterator
    {
       private int from;
       private int to;
+
       public boolean hasNext()
       {
          return from > to;
       }
+
       public Object next()
       {
          return stack[from--];
       }
+
       public void remove()
       {
          throw new UnsupportedOperationException();
       }
    }
 
-   /**
-    * A key for the stack.
-    */
+   /** A key for the stack. */
    public interface Key
    {
    }
@@ -167,7 +150,7 @@
    {
       StringBuffer buffer = new StringBuffer();
       buffer.append("[stack[");
-      for (int i = 0;i < ptr;i++)
+      for (int i = 0; i < ptr; i++)
       {
          Stack.Key key = stack[i];
          buffer.append(i == 0 ? "" : ",").append(key);

Modified: trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2HTMLTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,50 +1,49 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.format;
 
-import java.io.StringWriter;
-import java.util.ResourceBundle;
-import java.util.Map;
-import java.util.HashMap;
-
+import org.jboss.portal.common.util.MapResourceBundle;
+import org.jboss.portal.format.parser.bbcode.BBCodeParser;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLConfig;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLRenderer;
 import org.jboss.portal.format.util.CLLoader;
-import org.jboss.portal.format.parser.bbcode.BBCodeParser;
-import org.jboss.portal.common.util.MapResourceBundle;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute</a>
- * $Revision$
- */
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+/** @author <a href="theute at jboss.org">Thomas Heute</a> $Revision$ */
 public class BBCodeHTML2HTMLTestCase
-      extends junit.framework.TestCase
+   extends junit.framework.TestCase
 {
 
    public ToHTMLRenderer toHTMLRenderer;
    public StringWriter stringWriter;
 
-   public void setUp() throws Exception {
-      String location="org/jboss/portal/format/template";
+   public void setUp() throws Exception
+   {
+      String location = "org/jboss/portal/format/template";
 
       ToHTMLConfig config = new ToHTMLConfig();
       config.setLoader(new CLLoader(location));
@@ -60,7 +59,8 @@
       toHTMLRenderer.setWriter(stringWriter);
    }
 
-   public void tearDown() {
+   public void tearDown()
+   {
       stringWriter.flush();
    }
 

Modified: trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java
===================================================================
--- trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/format/src/main/org/jboss/portal/test/format/BBCodeHTML2TextTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.format;
 
-import java.io.IOException;
-import java.io.StringWriter;
-
 import org.jboss.portal.format.render.bbcodehtml.ToTextRenderer;
 import org.jboss.portal.format.template.BuildException;
 
-/**
- * @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$
- */
+import java.io.IOException;
+import java.io.StringWriter;
+
+/** @author <a href="theute at jboss.org">Thomas Heute </a> $Revision$ */
 public class BBCodeHTML2TextTestCase
-      extends junit.framework.TestCase
+   extends junit.framework.TestCase
 {
 
    public ToTextRenderer toTextRenderer;
@@ -125,8 +124,8 @@
       String text = "[quote=theute]myquote\nis a good quote\nisn't it ?[/quote]";
       toTextRenderer.render(text.toCharArray(), 0, text.length());
       assertEquals(
-            "theute wrote : myquote\n  | is a good quote\n  | isn't it ?",
-            stringWriter.toString());
+         "theute wrote : myquote\n  | is a good quote\n  | isn't it ?",
+         stringWriter.toString());
    }
 
    public void testBBCodeMultiQuoteMultiline()
@@ -134,8 +133,8 @@
       String text = "[quote=theute]myquote\nanother\n[quote=bob]quote of\nanother\ndude[/quote]\nNice quote\nisn't it ?[/quote]";
       toTextRenderer.render(text.toCharArray(), 0, text.length());
       assertEquals(
-            "theute wrote : myquote\n  | another\n  | bob wrote : quote of\n  |   | another\n  |   | dude\n  | Nice quote\n  | isn't it ?",
-            stringWriter.toString());
+         "theute wrote : myquote\n  | another\n  | bob wrote : quote of\n  |   | another\n  |   | dude\n  | Nice quote\n  | isn't it ?",
+         stringWriter.toString());
    }
 
    public void testBBCodeQuoteAnonymous()
@@ -220,7 +219,7 @@
       String text = "[url]http://www.jboss.com[/url][url]http://www.jboss.org[/url]";
       toTextRenderer.render(text.toCharArray(), 0, text.length());
       assertEquals("[ http://www.jboss.com ][ http://www.jboss.org ]",
-            stringWriter.toString());
+         stringWriter.toString());
    }
 
    public void testBBCodeCode()
@@ -230,14 +229,12 @@
       assertEquals("  | BBBold <b>HTMLBold</b>", stringWriter.toString());
    }
 
-   /**
-    * | BBBold | <b>HTMLBold </b>| normal
-    */
+   /** | BBBold | <b>HTMLBold </b>| normal */
    public void testBBCodeCodeMultiLine()
    {
       String text = "[code][b]BBBold[/b]\n<b>HTMLBold</b>\nnormal[/code]";
       toTextRenderer.render(text.toCharArray(), 0, text.length());
       assertEquals("  | BBBold\n  | <b>HTMLBold</b>\n  | normal", stringWriter
-            .toString());
+         .toString());
    }
 }

Modified: trunk/forums/build.xml
===================================================================
--- trunk/forums/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
@@ -31,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -82,18 +105,18 @@
         <path id="jboss.portal-core.classpath">
 	      <pathelement path="${jboss.portal-core.lib}/portal-core-lib.jar"/>
 	      <pathelement path="${jboss.portal-core.lib}/portal-core-test-lib.jar"/>
-              <pathelement path="${jboss.portal-core.lib}/jboss-portlet-api-lib.jar" />
+              <pathelement path="${jboss.portal-core.lib}/jboss-portlet-api-lib.jar"/>
         </path>
 	<path refid="jboss.portal-format.classpath"/>
 	<path refid="jboss.portal-common.classpath"/>
 	<path refid="jboss.portal-portlet.classpath"/>
 	<path refid="jboss.portal-server.classpath"/>
 	<path refid="jboss.portlet-api.classpath"/>
-	<path refid="jboss.portal-identity.classpath" />
+	<path refid="jboss.portal-identity.classpath"/>
 	<path refid="hibernate.hibernate.classpath"/>
-	<path refid="jboss.portal-test.classpath" />
-	<path refid="jboss.portal-security.classpath" />
-        <path refid="jboss.portal-jems.classpath" />
+	<path refid="jboss.portal-test.classpath"/>
+	<path refid="jboss.portal-security.classpath"/>
+        <path refid="jboss.portal-jems.classpath"/>
        </path>
 
       <!--+=======================================+-->
@@ -120,15 +143,15 @@
 	    <path refid="apache.ant.classpath"/>
        </path>
        <taskdef name="explode"
-	           classname="org.jboss.portal.common.ant.Explode"
-	           classpathref="explode.task.classpath"/>       
+                classname="org.jboss.portal.common.ant.Explode"
+                classpathref="explode.task.classpath"/>
   </target>
   
   <target name="configure-hibernatedoclet">
     <path id="hibernatedoclet.task.classpath">
       <path refid="xdoclet.xdoclet.classpath"/>
-      <path refid="apache.logging.classpath" />
-      <path refid="apache.collections.classpath" />
+      <path refid="apache.logging.classpath"/>
+      <path refid="apache.collections.classpath"/>
     </path>
     <taskdef name="hibernatedoclet"
              classname="xdoclet.modules.hibernate.HibernateDocletTask"
@@ -149,7 +172,7 @@
                _default:compile-etc,
                _default:compile-resources">
 		<!-- Add module specific elements here. -->
-		<hibernatedoclet
+      <hibernatedoclet
          destDir="${build.resources}/portal-forums-sar">
 			<fileset dir="${source.java}">
 				<include name="**/impl/*Impl.java"/>
@@ -171,7 +194,7 @@
          name="hibernate-export">
 			<classpath>
 				<path refid="javac.classpath"/>
-                                <path refid="apache.commons.classpath" />
+                                <path refid="apache.commons.classpath"/>
 				<pathelement location="${build.resources}/test"/>
 				<fileset dir="${build.lib}" includes="portal-forums-lib.jar"/>
 				<fileset dir="${jboss.home}/lib" includes="dom4j.jar,commons-logging.jar"/>
@@ -308,13 +331,13 @@
        <test name="org.jboss.portlet.test.forums.UserTestCase" />
        <test name="org.jboss.portlet.test.forums.AdminTestCase" />-->
          <!--<test name="org.jboss.portlet.test.forums.AdminFullTestCase" />-->
-	 <!--<test name="org.jboss.portlet.test.forums.AdminPostTestCase"/>
-         <test name="org.jboss.portlet.test.forums.AdminEditTopicTypeTestCase"/>
-         <test name="org.jboss.portlet.test.forums.AdminPollPostEditTestCase"/>
-         <test name="org.jboss.portlet.test.forums.TopicModelTestCase"/>
-         <test name="org.jboss.portlet.test.forums.ForumModelTestCase"/>
-         <test name="org.jboss.portlet.test.forums.CategoryModelTestCase"/>
-	 <test name="org.jboss.portlet.test.forums.PostModelTestCase"/>-->
+         <!--<test name="org.jboss.portlet.test.forums.AdminPostTestCase"/>
+            <test name="org.jboss.portlet.test.forums.AdminEditTopicTypeTestCase"/>
+            <test name="org.jboss.portlet.test.forums.AdminPollPostEditTestCase"/>
+            <test name="org.jboss.portlet.test.forums.TopicModelTestCase"/>
+            <test name="org.jboss.portlet.test.forums.ForumModelTestCase"/>
+            <test name="org.jboss.portlet.test.forums.CategoryModelTestCase"/>
+       <test name="org.jboss.portlet.test.forums.PostModelTestCase"/>-->
          <classpath>
 				<pathelement location="${build.classes}"/>
             <!--<pathelement location="${build.resources}/portal-core-sar" />-->

Modified: trunk/forums/src/main/org/jboss/portlet/forums/Context.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/Context.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/Context.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,33 +33,47 @@
  *****************************************/
 package org.jboss.portlet.forums;
 
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.portlet.PortletFileUpload;
 import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
-import org.jboss.portlet.forums.action.*;
-import org.jboss.portlet.forums.commands.post.*;
-import org.jboss.portlet.forums.impl.*;
+import org.jboss.portlet.forums.action.Action;
+import org.jboss.portlet.forums.action.EditPostAction;
+import org.jboss.portlet.forums.action.NewTopicAction;
+import org.jboss.portlet.forums.action.ProcessCommandAction;
+import org.jboss.portlet.forums.action.ReplyAction;
+import org.jboss.portlet.forums.commands.post.DeletePollCommand;
+import org.jboss.portlet.forums.commands.post.DeletePostCommand;
+import org.jboss.portlet.forums.commands.post.EditPostCommand;
+import org.jboss.portlet.forums.commands.post.NewTopicCommand;
+import org.jboss.portlet.forums.commands.post.ReplyCommand;
+import org.jboss.portlet.forums.commands.post.RepostCommand;
+import org.jboss.portlet.forums.commands.post.VoteTopicCommand;
+import org.jboss.portlet.forums.helper.ForumsTools;
+import org.jboss.portlet.forums.helper.TempFileBinding;
+import org.jboss.portlet.forums.impl.MessageImpl;
+import org.jboss.portlet.forums.impl.PollImpl;
+import org.jboss.portlet.forums.impl.PollOptionImpl;
+import org.jboss.portlet.forums.impl.PosterImpl;
+import org.jboss.portlet.forums.impl.UploadedFileImpl;
 import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Poll;
 import org.jboss.portlet.forums.model.Poster;
 import org.jboss.portlet.forums.model.UploadedFile;
-import org.jboss.portlet.forums.helper.TempFileBinding;
-import org.jboss.portlet.forums.helper.ForumsTools;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.portlet.PortletFileUpload;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
 
 import javax.portlet.PortletPreferences;
-import javax.servlet.http.HttpSessionBindingListener;
 import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.LinkedList;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -48,136 +85,83 @@
 {
    // Request parameters
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_submit;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_confirm;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_preview;
 
-   /**
-    * Scope : NewTopic/EditPost/Reply
-    * When it's true that means the button add attachment is pressed.
-    */
+   /** Scope : NewTopic/EditPost/Reply When it's true that means the button add attachment is pressed. */
    public boolean p_attach;
 
-   /**
-    * Scope : NewTopic/EditPost/Reply
-    * When it's true the user choosed to see the add attachment panel.
-    */
+   /** Scope : NewTopic/EditPost/Reply When it's true the user choosed to see the add attachment panel. */
    public boolean p_attach_box;
 
-   /**
-    * Scope : editing a post.
-    * When it's true the user choosed to see the posted attachment.
-    */
+   /** Scope : editing a post. When it's true the user choosed to see the posted attachment. */
    public boolean p_posted_attach;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_mode;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_forum_id;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_topic_id;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_post_id;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_post_parent_topic_id;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_topic_type;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_cancel;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_notify;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int p_vote_option_id;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_poll_delete;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean p_topic_first_post = false;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Poll p_poll;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Message p_message;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Poster p_poster;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public List p_deleted_attachments = new ArrayList();
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public List p_session_attachments = new ArrayList();
 
    public Map p_updated_attachments = new HashMap();
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    boolean c_refresh;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    private ForumsModule forumsModule;
 
    private Map files = new HashMap();
 
-   /**
-    * Creates a new {@link Context} object.
-    */
+   /** Creates a new {@link Context} object. */
    public Context()
    {
       //forumsModule = new ForumsModuleImpl();
@@ -230,7 +214,7 @@
          //TODO:Some nice error message
       }
       //if we started editing post, already stored attachs in sessions should be cleaned.
-      if (req.getParameters().get("editPostInit","none").equals("true"))
+      if (req.getParameters().get("editPostInit", "none").equals("true"))
       {
          //clear stored files from session
          req.getPortletSession().setAttribute(ForumsConstants.DISK_PERSISTED_ATTACHEMENTS, null);
@@ -464,13 +448,13 @@
             if (isStored)
             {
                int index = Integer.parseInt(s);
-               String newComment = req.getParameters().get("attach_comment[stored_attach_"+ s +"]","");
+               String newComment = req.getParameters().get("attach_comment[stored_attach_" + s + "]", "");
                attachmentsManager.getUpdatedAttachments().put(new Integer(index), newComment);
             }
             //if this is previously uploaded file update comment in binding in Manager
             else
             {
-               attachmentsManager.updateBindingComment(s, req.getParameters().get("attach_comment["+ s +"]",""));
+               attachmentsManager.updateBindingComment(s, req.getParameters().get("attach_comment[" + s + "]", ""));
             }
             session_attachment_deleted = true;
             break;
@@ -483,7 +467,6 @@
       //[Map]indexes of attachments and new comments that should be updated in DB
       p_updated_attachments = attachmentsManager.getUpdatedAttachments();
 
-
       // Are we refreshing the page ?
       boolean c_refresh = p_preview;
       c_refresh |= p_poll_delete;
@@ -739,9 +722,8 @@
 
 
    /**
-    * Object that stores binding to uploaded and stored as Temp Files attachments. Object is stored in
-    * session and implements HttpSessionBindingListener so when session is invalidated it removes stored
-    * files from disk
+    * Object that stores binding to uploaded and stored as Temp Files attachments. Object is stored in session and
+    * implements HttpSessionBindingListener so when session is invalidated it removes stored files from disk
     */
    private class AttachmentsManager implements HttpSessionBindingListener
    {
@@ -763,6 +745,7 @@
 
       /**
        * Simply adds new TempFileBinding
+       *
        * @param tmp
        */
       public void addBinding(TempFileBinding tmp)
@@ -772,6 +755,7 @@
 
       /**
        * Removes Binding of id such as in argument
+       *
        * @param id
        */
       public void removeBinding(String id)
@@ -790,6 +774,7 @@
 
       /**
        * Updates comment for attachment
+       *
        * @param id
        * @param comment
        */
@@ -812,6 +797,7 @@
 
       /**
        * If object removed from session we do clean up and removes every file stored to disk
+       *
        * @param httpSessionBindingEvent
        */
       public void valueUnbound(HttpSessionBindingEvent httpSessionBindingEvent)
@@ -835,6 +821,7 @@
 
       /**
        * Stores indexes of persisted attachments which should be deleted
+       *
        * @return
        */
       public List getDeletedAttachments()
@@ -849,6 +836,7 @@
 
       /**
        * Stores indexes of persisted attachments and their new comments.
+       *
        * @return
        */
       public Map getUpdatedAttachments()
@@ -864,6 +852,7 @@
 
    /**
     * provides session unique integer value
+    *
     * @param req
     * @return
     */

Modified: trunk/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/ForumsConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -18,330 +41,200 @@
  */
 public interface ForumsConstants //extends Constants
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_SMALL_HEADER = "small_header";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_TOPIC_NOTIFY = "search_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_SEARCH_BODY = "search_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_MESSAGE_BODY = "message_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_INDEX_BODY = "index_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_VIEWFORUM_BODY = "viewforum_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_VIEWTOPIC_BODY = "viewtopic_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_VIEWTOPIC_ATTACH_BODY = "viewtopic_attach_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_VIEWTOPIC_POLL_RESULT = "viewtopic_poll_result";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_VIEWTOPIC_POLL_BALLOT = "viewtopic_poll_ballot";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_JUMP_BOX = "jumpbox";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_POSTING_BODY = "posting_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_POSTING_POLL_BODY = "posting_poll_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_POSTING_ATTACH_BODY = "posting_attach_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADD_ATTACHMENT_BODY = "add_attachment_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_POSTED_ATTACHMENTS_BODY = "posted_attachments_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_POSTING_TOPIC_REVIEW = "posting_topic_review";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_POSTING_PREVIEW = "posting_preview";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_MODCP_BODY = "modcp_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_MODCP_MOVE = "modcp_move";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CONFIRM_BODY = "confirm_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ERROR_BODY = "error_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_SEARCH_RESULTS_POSTS = "search_results_posts";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_SEARCH_RESULTS_TOPICS = "search_results_topics";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_WATCHED_TOPICS_BODY = "watched_topics_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_WATCHED_FORUMS_BODY = "watched_forums_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_AUTH_FORUM_BODY = "admin/auth_forum_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_AUTH_SELECT_BODY = "admin/auth_select_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_FORUM_ADMIN_BODY = "admin/forum_admin_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_FORUM_EDIT_BODY = "admin/forum_edit_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_CATEGORY_EDIT_BODY = "admin/category_edit_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String THEMENAME = "subSilver";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_FORUM_DELETE_BODY = "admin/forum_delete_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_ADMIN_ATTACH_MANAGE_BODY = "admin/attach_manage_body";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_B_CLOSE = "code/b_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_B_OPEN = "code/b_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_CODE_CLOSE = "code/code_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_CODE_OPEN = "code/code_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_COLOR_CLOSE = "code/color_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_COLOR_OPEN = "code/color_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_EMAIL = "code/email";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_I_CLOSE = "code/i_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_I_OPEN = "code/i_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_IMG = "code/img";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_LISTITEM = "code/listitem";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_OLIST_CLOSE = "code/olist_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_OLIST_OPEN = "code/olist_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_QUOTE_CLOSE = "code/quote_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_QUOTE_OPEN = "code/quote_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_QUOTE_USERNAME_OPEN = "code/quote_username_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_SIZE_CLOSE = "code/size_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_SIZE_OPEN = "code/size_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_U_CLOSE = "code/u_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_U_OPEN = "code/u_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_ULIST_CLOSE = "code/ulist_close";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_ULIST_OPEN = "code/ulist_open";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_CODE_URL = "code/url";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_THEME_BLOCK_TOPICS = "block/topics";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_MAIL_TOPIC_NOTIFY = "topic_notify";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String TPL_MAIL_FORUM_NOTIFY = "forum_notify";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int BLOCK_TOPICS_MODE_LATEST_POSTS = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int BLOCK_TOPICS_MODE_HOT_TOPICS = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int BLOCK_TOPICS_MODE_HOTTEST_TOPICS = 2;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int BLOCK_TOPICS_MODE_MOST_VIEWED = 3;
 
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] SORT_BY_TYPES =
       {
          "${bb.Sort_Time}",
@@ -350,9 +243,7 @@
          "${bb.Sort_Forum}"
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int[] PREVIOUS_DAYS =
       {
          0,
@@ -365,9 +256,7 @@
          364
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] PREVIOUS_DAYS_TEXT_TOPICS =
       {
          "${bb.All_Topics}",
@@ -380,9 +269,7 @@
          "${bb.1_Year}"
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] PREVIOUS_DAYS_TEXT_POSTS =
       {
          "${bb.All_Posts}",
@@ -395,9 +282,7 @@
          "${bb.1_Year}"
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] FORUM_AUTH_FORM_FIELD_NAMES =
       {
          "auth_view",
@@ -413,9 +298,7 @@
          "auth_attachment"
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] FORUM_AUTH_FORM_FIELD_LABELS =
       {
          "${bb.View}",
@@ -431,9 +314,7 @@
          "${bb.UploadedFile}"
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] FORUM_AUTH_LEVEL_LABELS =
       {
          "ALL",
@@ -449,49 +330,31 @@
       };
     */
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int GENERAL_MESSAGE = 200;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int GENERAL_ERROR = 202;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int CRITICAL_MESSAGE = 203;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int CRITICAL_ERROR = 204;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int POST_NORMAL = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int POST_STICKY = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int POST_ANNOUNCE = 2;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int POST_GLOBAL_ANNONCE = 3;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] AUTH_TYPE_TO_MESSAGE =
       {
          null,
@@ -509,9 +372,7 @@
          null,
       };
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int[] TOPIC_TYPE_TO_AUTH_TYPE =
       {
          AuthType.POST,
@@ -522,109 +383,67 @@
 
    // modes
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_NO_MODE = -1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_VOTE = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_REPLY = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_QUOTE = 2;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_EDIT_POST = 3;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_DELETE = 4;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_POLL_DELETE = 5;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_NEW_TOPIC = 6;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_REPOST = 7;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_SMILIES = 8;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMODE_TOPIC_REVIEW = 9;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_VOTE = 0x0000001;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_REPLY = 0x0000002;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_QUOTE = 0x0000004;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_EDIT_POST = 0x0000008;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_DELETE = 0x0000010;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_POLL_DELETE = 0x0000020;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_NEW_TOPIC = 0x0000040;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_SMILIES = 0x0000080;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int PMASK_TOPIC_REVIEW = 0x0000100;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int[] PMASKS =
       {
          PMASK_VOTE,
@@ -649,44 +468,28 @@
       };
     */
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_NO_MODE = -1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_DELETE = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_MOVE = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_LOCK = 2;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_UNLOCK = 3;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_SPLIT = 4;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int MMODE_IP = 5;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String[] AUTH_PRESETS_NAMES =
       {
          "${bb.Public}",
@@ -845,94 +648,58 @@
        */
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int FORUM_UNLOCKED = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int FORUM_LOCKED = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int TOPIC_UNLOCKED = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int TOPIC_LOCKED = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int TOPIC_MOVED = 2;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int TOPIC_WATCH_UN_NOTIFIED = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    int TOPIC_WATCH_NOTIFIED = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String POST_CAT_URL = "c";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String POST_FORUM_URL = "f";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String POST_TOPIC_URL = "t";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String POST_POST_URL = "p";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String POST_USERS_URL = "u";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String POST_ROLES_URL = "g";
 
-   /**
-    * When a notification message is sent, send a link to the message.
-    */
+   /** When a notification message is sent, send a link to the message. */
    int WATCH_MODE_LINKED = 0;
 
-   /**
-    * When a notification message is sent, send the message content.
-    */
+   /** When a notification message is sent, send the message content. */
    int WATCH_MODE_EMBEDED = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final String FORUMSMODULE_JNDINAME = "java:portal/ForumsModule";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String USER_SIGNATURE_PROPERTY = "portal.user.forums.signature";
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    String USER_SIGNATURE_ADD_PROPERTY = "portal.user.forums.addsignature";
 
    String DEFAULT_DATE_PATTERN = "EEE MMM d, yyyy HH:mm aaa";
@@ -944,7 +711,7 @@
    String FILE_SESSION_INDEX = "portal.user.forums.file_session_index";
 
    String ATTACHMENT_TOKENS_MANAGER = "org.jboss.portlet.forums.helper.AttachmentTokenManager";
-                                             
+
 }
 
 //// Debug Level

Modified: trunk/forums/src/main/org/jboss/portlet/forums/ForumsModule.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/ForumsModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/ForumsModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,23 @@
  *****************************************/
 package org.jboss.portlet.forums;
 
+import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.identity.User;
-import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.jems.hibernate.HibernateProvider;
+import org.jboss.portlet.forums.command.ActionCommand;
+import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portlet.forums.model.*;
-import org.jboss.portlet.forums.command.ActionCommand;
+import org.jboss.portlet.forums.model.Attachment;
+import org.jboss.portlet.forums.model.Category;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.ForumWatch;
+import org.jboss.portlet.forums.model.Message;
+import org.jboss.portlet.forums.model.Poll;
+import org.jboss.portlet.forums.model.Post;
+import org.jboss.portlet.forums.model.Poster;
+import org.jboss.portlet.forums.model.Topic;
+import org.jboss.portlet.forums.model.TopicWatch;
+import org.jboss.portlet.forums.model.Watch;
 
 import java.util.Date;
 import java.util.List;
@@ -30,6 +63,7 @@
 {
 
    public HibernateProvider getHibernate();
+
    /**
     *
     */
@@ -71,8 +105,8 @@
 
 
    /**
-    * Returns some topics of a forum that are not of a certain type
-    * The topics are ordered by creation date from oldest to newest
+    * Returns some topics of a forum that are not of a certain type The topics are ordered by creation date from oldest
+    * to newest
     *
     * @param forum   Forum in which we want to search for topics
     * @param type    Type to avoid
@@ -88,8 +122,8 @@
       throws ModuleException;
 
    /**
-    * Returns some topics of a forum that are not of a certain type
-    * The topics are ordered by creation date from newest to oldest
+    * Returns some topics of a forum that are not of a certain type The topics are ordered by creation date from newest
+    * to oldest
     *
     * @param forum   Forum in which we want to search for topics
     * @param type    Type to avoid
@@ -453,7 +487,7 @@
    List findForumWatchByUser(User user) throws ModuleException;
 
    Attachment findFindAttachmentById(Integer attachID)
-        throws ModuleException;
+      throws ModuleException;
 
 
    Poster createPoster(String userID) throws ModuleException;
@@ -483,13 +517,10 @@
     */
    TopicWatch findTopicWatchById(Integer topicWatchID) throws ModuleException;
 
-   /**
-    * @param watch
-    */
+   /** @param watch  */
    void removeWatch(Watch watch) throws ModuleException;
 
    /**
-    *
     * @param cmd
     * @return
     * @throws CommandException

Modified: trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/ForumsPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,18 +34,15 @@
 package org.jboss.portlet.forums;
 
 
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.result.ResultType;
-import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 import org.jboss.portal.common.util.ProxyInfo;
-import org.jboss.portal.identity.PropertyMap;
-import org.jboss.portal.identity.User;
 import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
+import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLConfig;
 import org.jboss.portal.format.render.bbcodehtml.ToHTMLRenderer;
 import org.jboss.portal.format.util.CLLoader;
+import org.jboss.portal.identity.PropertyMap;
+import org.jboss.portal.identity.User;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.JBossPortlet;
@@ -36,6 +56,9 @@
 import org.jboss.portlet.forums.action.ProcessCommandAction;
 import org.jboss.portlet.forums.action.ReplyAction;
 import org.jboss.portlet.forums.action.TopicAction;
+import org.jboss.portlet.forums.command.CommandException;
+import org.jboss.portlet.forums.command.result.Result;
+import org.jboss.portlet.forums.command.result.ResultType;
 import org.jboss.portlet.forums.commands.CommandConstants;
 import org.jboss.portlet.forums.commands.admin.CreateCategoryCommand;
 import org.jboss.portlet.forums.commands.admin.CreateForumCommand;
@@ -55,13 +78,14 @@
 import org.jboss.portlet.forums.commands.post.ForumCommand;
 import org.jboss.portlet.forums.commands.post.NewTopicCommand;
 import org.jboss.portlet.forums.commands.post.ReplyCommand;
+import org.jboss.portlet.forums.helper.AttachmentToken;
+import org.jboss.portlet.forums.helper.AttachmentTokenManager;
+import org.jboss.portlet.forums.helper.FileBinding;
 import org.jboss.portlet.forums.helper.ForumsTools;
 import org.jboss.portlet.forums.helper.Goto;
 import org.jboss.portlet.forums.helper.GotoWithOffset;
 import org.jboss.portlet.forums.helper.IndexIterator;
-import org.jboss.portlet.forums.helper.FileBinding;
-import org.jboss.portlet.forums.helper.AttachmentTokenManager;
-import org.jboss.portlet.forums.helper.AttachmentToken;
+import org.jboss.portlet.forums.model.Attachment;
 import org.jboss.portlet.forums.model.Category;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.ForumWatch;
@@ -72,7 +96,6 @@
 import org.jboss.portlet.forums.model.Poster;
 import org.jboss.portlet.forums.model.Topic;
 import org.jboss.portlet.forums.model.TopicWatch;
-import org.jboss.portlet.forums.model.Attachment;
 import org.jboss.portlet.forums.properties.TCCLXProperties;
 import org.jboss.portlet.forums.theme.FolderType;
 import org.jboss.portlet.forums.theme.ForumsTheme;
@@ -85,10 +108,10 @@
 import javax.portlet.PortletPreferences;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
 import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
-import javax.portlet.PortletSession;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -303,9 +326,6 @@
       }*/
 
 
-
-
-
       ResourceBundle bundle = getResourceBundle(req.getLocale());
 
       resp.setContentType("text/html");
@@ -640,8 +660,8 @@
    }
 
    /**
-    * Method do action processing for Moderator functions from moderator panel
-    * in forum view and moderator bar in topic view.
+    * Method do action processing for Moderator functions from moderator panel in forum view and moderator bar in topic
+    * view.
     * <p/>
     * This method <b>MUST</b> get both proper "f" (forum id) and "t" (topic id) params.
     *
@@ -2111,27 +2131,27 @@
             {
                topic_type = ((EditPostAction)faction).getTopic().getType();
             }
-             switch (topic_type) 
-             {
+            switch (topic_type)
+            {
                case 1:
-                 {
-                   response.setRenderParameter("topictype",Integer.toString(1));
-                 }
-                 break;
-               
+               {
+                  response.setRenderParameter("topictype", Integer.toString(1));
+               }
+               break;
+
                case 2:
-                 {
-                   response.setRenderParameter("topictype",Integer.toString(2));
-                 }
-                 break;
-               
-             
+               {
+                  response.setRenderParameter("topictype", Integer.toString(2));
+               }
+               break;
+
+
                default:
-                 {
-                   response.setRenderParameter("topictype",Integer.toString(0));
-                 }
-                 break;
-             }
+               {
+                  response.setRenderParameter("topictype", Integer.toString(0));
+               }
+               break;
+            }
             /*
              // Create the topic type selected
              if (isAuthSticky || isAuthAnnounce)
@@ -4077,7 +4097,7 @@
          e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
       }
       Calendar after = Calendar.getInstance();
-      after.add(Calendar.DATE, - days);
+      after.add(Calendar.DATE, -days);
       Collection topics = new LinkedList();
       Date time = after.getTime();
 
@@ -4144,8 +4164,6 @@
       }*/
 
 
-
-
       return root;
    }
 
@@ -5614,7 +5632,6 @@
           */
 
 
-
          boolean canDelete = false;
          boolean canIP = false;
 
@@ -5834,17 +5851,17 @@
          PortletURL miniPostURL = resp.createRenderURL();
          try
          {
-             miniPostURL.setWindowState(WindowState.MAXIMIZED);
+            miniPostURL.setWindowState(WindowState.MAXIMIZED);
          }
          catch (WindowStateException e)
          {
-             e.printStackTrace();
+            e.printStackTrace();
          }
          miniPostURL.setParameter("op", OP_SHOWTOPIC);
          miniPostURL.setParameter("p", "" + post.getId());
 
-         String miniPostUrlString = miniPostURL.toString()+"#"+post.getId();
-         miniPostUrlString = miniPostUrlString.replaceFirst("/auth","");
+         String miniPostUrlString = miniPostURL.toString() + "#" + post.getId();
+         miniPostUrlString = miniPostUrlString.replaceFirst("/auth", "");
          postRow.put("U_MINI_POST", miniPostUrlString);
          postRow.put("U_POST_ID", post.getId().toString());
 
@@ -6741,10 +6758,9 @@
    }
 
    /**
-    * Get a <code>SimpleDateFormat</code> object from the session. The object is stored
-    * in the session because it is expensive to create and we want to reuse it as
-    * much as we can. Also it is configured with the date format taken from the preference
-    * of the user if it exists.
+    * Get a <code>SimpleDateFormat</code> object from the session. The object is stored in the session because it is
+    * expensive to create and we want to reuse it as much as we can. Also it is configured with the date format taken
+    * from the preference of the user if it exists.
     *
     * @param req the request that maybe contains the format object
     * @return the format object
@@ -6814,8 +6830,4 @@
    }
 
 
-
-
-
-
 }
\ No newline at end of file

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/Action.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/Action.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/Action.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/EditPostAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/EditPostAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/EditPostAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -12,7 +35,12 @@
 
 import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.impl.PollImpl;
-import org.jboss.portlet.forums.model.*;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Message;
+import org.jboss.portlet.forums.model.Poll;
+import org.jboss.portlet.forums.model.Post;
+import org.jboss.portlet.forums.model.Poster;
+import org.jboss.portlet.forums.model.Topic;
 
 import java.util.Collections;
 import java.util.List;
@@ -126,9 +154,7 @@
       return attachments;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void init()
    {
       try

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/ForumAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/ForumAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/ForumAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,13 @@
  *****************************************/
 package org.jboss.portlet.forums.action;
 
-import java.util.List;
-
 import org.jboss.portlet.forums.ForumsModule;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Poster;
 
+import java.util.List;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -25,19 +48,13 @@
 public abstract class ForumAction
    extends Action
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected ForumsModule module;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int INIT = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int REFRESH = 1;
    private final int mode;
 
@@ -97,9 +114,7 @@
     */
    public abstract Message getMessage();
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public abstract void init();
 
    /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/NewTopicAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/NewTopicAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/NewTopicAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,9 +33,6 @@
  *****************************************/
 package org.jboss.portlet.forums.action;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.impl.MessageImpl;
 import org.jboss.portlet.forums.impl.PollImpl;
@@ -22,6 +42,9 @@
 import org.jboss.portlet.forums.model.Poll;
 import org.jboss.portlet.forums.model.Poster;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -115,9 +138,7 @@
       return attachments;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void init()
    {
       try

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/PostAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/PostAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/PostAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/ProcessCommandAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/ProcessCommandAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/ProcessCommandAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/ReplyAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/ReplyAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/ReplyAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,9 +33,6 @@
  *****************************************/
 package org.jboss.portlet.forums.action;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.Message;
@@ -20,6 +40,9 @@
 import org.jboss.portlet.forums.model.Poster;
 import org.jboss.portlet.forums.model.Topic;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -138,9 +161,7 @@
       return attachments;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void init()
    {
       try

Modified: trunk/forums/src/main/org/jboss/portlet/forums/action/TopicAction.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/action/TopicAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/action/TopicAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/AbstractCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/AbstractCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/AbstractCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 import org.apache.log4j.Logger;
 
-/**
- * @author <a href="theute at users.sourceforge.net">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at users.sourceforge.net">Thomas Heute</a> $Revision$ */
 public abstract class AbstractCommand
-      implements Command, CommandConstants
+   implements Command, CommandConstants
 {
 
    protected Logger log = Logger.getLogger(getClass());

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/ActionCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/ActionCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/ActionCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
-import org.jboss.portlet.forums.command.Command;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
 

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/AttributeType.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/AttributeType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/AttributeType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/Command.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/Command.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/Command.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 import org.jboss.portlet.forums.command.result.Result;
@@ -31,13 +32,9 @@
  */
 public interface Command
 {
-   /**
-    * Execute the real business job.
-    */
+   /** Execute the real business job. */
    Result execute() throws CommandException;
 
-   /**
-    * Returns the command configurator.
-    */
+   /** Returns the command configurator. */
    Configurator getConfigurator();
 }

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/CommandConstants.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/CommandConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/CommandConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 import org.jboss.portlet.forums.command.result.ImmutableResult;
 import org.jboss.portlet.forums.command.result.ResultType;
 
-/**
- * @author <a href="theute at users.sourceforge.net">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at users.sourceforge.net">Thomas Heute</a> $Revision$ */
 public interface CommandConstants
 {
    ResultType TYPE_COMPOSITE = new ImmutableResult("TYPE_COMPOSITE");

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/CommandException.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/CommandException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/CommandException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/CompositeCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/CompositeCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/CompositeCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
+import org.jboss.portlet.forums.command.result.Result;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import org.jboss.portlet.forums.command.result.Result;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/Configurator.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/Configurator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/Configurator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 /**
@@ -30,22 +31,38 @@
    boolean contains(AttributeType attribute);
 
    void setObject(AttributeType attribute, Object value) throws NoSuchAttachmentException;
+
    void setInt(AttributeType attribute, int value) throws NoSuchAttachmentException;
+
    void setBoolean(AttributeType attribute, boolean value) throws NoSuchAttachmentException;
+
    void setFloat(AttributeType attribute, float value) throws NoSuchAttachmentException;
+
    void setLong(AttributeType attribute, long value) throws NoSuchAttachmentException;
+
    void setDouble(AttributeType attribute, double value) throws NoSuchAttachmentException;
+
    void setChar(AttributeType attribute, char value) throws NoSuchAttachmentException;
+
    void setShort(AttributeType attribute, short value) throws NoSuchAttachmentException;
+
    void setByte(AttributeType attribute, byte value) throws NoSuchAttachmentException;
 
    Object getObject(AttributeType attribute) throws NoSuchAttachmentException;
+
    int getInt(AttributeType attribute) throws NoSuchAttachmentException;
+
    boolean getBoolean(AttributeType attribute) throws NoSuchAttachmentException;
+
    float getFloat(AttributeType attribute) throws NoSuchAttachmentException;
+
    long getLong(AttributeType attribute) throws NoSuchAttachmentException;
+
    double getDouble(AttributeType attribute) throws NoSuchAttachmentException;
+
    char getChar(AttributeType attribute) throws NoSuchAttachmentException;
+
    short getShort(AttributeType attribute) throws NoSuchAttachmentException;
+
    byte getByte(AttributeType attribute) throws NoSuchAttachmentException;
 }

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/EmptyConfigurator.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/EmptyConfigurator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/EmptyConfigurator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/NoSuchAttachmentException.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/NoSuchAttachmentException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/NoSuchAttachmentException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/ReflectedConfigurator.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/ReflectedConfigurator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/ReflectedConfigurator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
+import org.apache.log4j.Logger;
+
 import java.lang.reflect.Field;
 
-import org.apache.log4j.Logger;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -56,10 +57,10 @@
          getClass().getField(attribute.getName());
          return true;
       }
-      catch(NoSuchFieldException ignore)
+      catch (NoSuchFieldException ignore)
       {
       }
-      catch(SecurityException ignore)
+      catch (SecurityException ignore)
       {
       }
       return false;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/UnexpectedCommandException.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/UnexpectedCommandException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/UnexpectedCommandException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/filter/AbstractCommandFilter.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/filter/AbstractCommandFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/filter/AbstractCommandFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.filter;
 
 import org.apache.log4j.Logger;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CommandFilter.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CommandFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CommandFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.filter;
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.command.Command;
 import org.jboss.portlet.forums.command.CommandException;
+import org.jboss.portlet.forums.command.result.Result;
 
 /**
  * A command filter which adds value around the command execution.
@@ -34,6 +35,8 @@
 public interface CommandFilter
 {
    Result filter(Command command) throws CommandException;
+
    void setNext(CommandFilter filter);
+
    CommandFilter getNext();
 }

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CompositeFilter.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CompositeFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/filter/CompositeFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.filter;
 
 import org.jboss.portlet.forums.command.Command;
+import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.CompositeCommand;
-import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.result.CompositeResult;
 import org.jboss.portlet.forums.command.result.Result;
 

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/filter/ExecuteFilter.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/filter/ExecuteFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/filter/ExecuteFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.filter;
 
+import org.jboss.portlet.forums.command.Command;
+import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portlet.forums.command.Command;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/result/CompositeResult.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/result/CompositeResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/result/CompositeResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.result;
 
+import org.jboss.portlet.forums.command.CommandConstants;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.jboss.portlet.forums.command.CommandConstants;
-
 /**
+ * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version <tt>$Revision$</tt>
- * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  */
 public class CompositeResult
    implements Result

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/result/ImmutableResult.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/result/ImmutableResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/result/ImmutableResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.result;
 
 
-/**
- * @author <a href="theute at users.sourceforge.net">Thomas Heute</a>
- * $Revision$
- */
+/** @author <a href="theute at users.sourceforge.net">Thomas Heute</a> $Revision$ */
 public class ImmutableResult
    extends ResultType
    implements Result

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/result/Result.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/result/Result.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/result/Result.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.result;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/result/ResultType.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/result/ResultType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/result/ResultType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.result;
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/command/result/SimpleResult.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/command/result/SimpleResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/command/result/SimpleResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portlet.forums.command.result;
 
 import java.util.HashMap;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/AbstractCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/AbstractCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/AbstractCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,11 +34,11 @@
 package org.jboss.portlet.forums.commands;
 
 import org.apache.log4j.Logger;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.command.ActionCommand;
 import org.jboss.portlet.forums.command.Configurator;
 import org.jboss.portlet.forums.command.ReflectedConfigurator;
-import org.jboss.portlet.forums.command.ActionCommand;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -25,9 +48,7 @@
    extends ActionCommand
    implements CommandConstants
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected Logger log = Logger.getLogger(getClass());
    private final ReflectedConfigurator configurator = new ReflectedConfigurator(this);
 

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/BBAttributeType.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/BBAttributeType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/BBAttributeType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -19,74 +42,46 @@
 public class BBAttributeType
    extends AttributeType
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType MODULE = new BBAttributeType("module");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType HOMES = new BBAttributeType("homes");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType NOTIFY = new BBAttributeType("notify");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType POLL_DELETE = new BBAttributeType("poll_delete");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType TOPIC_TYPE = new BBAttributeType("topic_type");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType POLL = new BBAttributeType("poll");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType MODE = new BBAttributeType("mode");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType CURRENT_TIME = new BBAttributeType("current_time");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType MESSAGE = new BBAttributeType("message");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType POST_ID = new BBAttributeType("postId");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType TOPIC_ID = new BBAttributeType("topicId");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType FORUM_ID = new BBAttributeType("forumId");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType VOTE_OPTION_ID = new BBAttributeType("voteOptionId");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final BBAttributeType QUOTE = new BBAttributeType("quote");
 
    private BBAttributeType(String name)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/CommandConstants.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/CommandConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/CommandConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -51,351 +74,215 @@
       }
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ResultType TYPE_POST_DELETED = SimpleResultType.TYPE_POST_DELETED;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ResultType TYPE_COMPOSITE = SimpleResultType.TYPE_COMPOSITE;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_INSERT_VOTE = new ImmutableResult("TYPE_CANNOT_INSERT_VOTE");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_OBTAIN_USER_DATA = new ImmutableResult("TYPE_CANNOT_OBTAIN_USER_DATA");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_VOTE_CAST = new ImmutableResult("TYPE_VOTE_CAST");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NO_VOTE_OPTION = new ImmutableResult("TYPE_NO_VOTE_OPTION");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_REDIRECT = new ImmutableResult("TYPE_REDIRECT");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_ERROR_IN_POSTING = new ImmutableResult("TYPE_ERROR_IN_POSTING");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_ERROR_IN_DELETING_POST = new ImmutableResult("TYPE_ERROR_IN_DELETING_POST");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_ERROR_IN_DELETING_POLL = new ImmutableResult("TYPE_ERROR_IN_DELETING_POLL");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_POLL_DELETED = new ImmutableResult("TYPE_POLL_DELETED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CONTINUE = new ImmutableResult("TYPE_CONTINUE");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FORUM_LOCKED = new ImmutableResult("TYPE_FORUM_LOCKED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_ALREADY_VOTED = new ImmutableResult("TYPE_ALREADY_VOTED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NOT_AUTHORIZED = new ImmutableResult("TYPE_NOT_AUTHORIZED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOPIC_IS_LOCKED = new ImmutableResult("TYPE_TOPIC_IS_LOCKED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_XXX_OTHER_POST_WHEN_NOT_MODERATOR =
       new ImmutableResult("TYPE_CANNOT_XXX_OTHER_POST_WHEN_NOT_MODERATOR");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_DELETE_REPLIED = new ImmutableResult("TYPE_CANNOT_DELETE_REPLIED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_DELETE_POLL = new ImmutableResult("TYPE_CANNOT_DELETE_POLL");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FORUM_CREATED = new ImmutableResult("TYPE_FORUM_CREATED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_CREATE_FORUM_INVALID_NAME =
       new ImmutableResult("TYPE_CANNOT_CREATE_FORUM_INVALID_NAME");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_CREATE_FORUM_INVALID_CATEGORY =
       new ImmutableResult("TYPE_CANNOT_CREATE_FORUM_INVALID_CATEGORY");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_CREATE_FORUM_INSERTION_FAILED =
       new ImmutableResult("TYPE_CANNOT_CREATE_FORUM_INSERTION_FAILED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CATEGORY_CREATED = new ImmutableResult("TYPE_CATEGORY_CREATED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_CREATE_CATEGORY_INSERTION_FAILED =
       new ImmutableResult("TYPE_CANNOT_CREATE_CATEGORY_INSERTION_FAILED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_CREATE_CATEGORY_INVALID_NAME =
       new ImmutableResult("TYPE_CANNOT_CREATE_CATEGORY_INVALID_NAME");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FORUM_REMOVED = new ImmutableResult("TYPE_FORUM_REMOVED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_REMOVE_FORUM_REMOVAL_FAILED =
       new ImmutableResult("TYPE_CANNOT_REMOVE_FORUM_REMOVAL_FAILED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FORUM_MOVED_AND_REMOVED = new ImmutableResult("TYPE_FORUM_MOVED_AND_REMOVED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_MOVE_AND_REMOVE_FORUM = new ImmutableResult("TYPE_CANNOT_MOVE_AND_REMOVE_FORUM");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CATEGORY_REMOVED = new ImmutableResult("TYPE_CATEGORY_REMOVED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_REMOVE_CATEGORY = new ImmutableResult("TYPE_CANNOT_REMOVE_CATEGORY");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FORUMS_ORDERED = new ImmutableResult("TYPE_FORUMS_ORDERED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_ORDER_FORUMS = new ImmutableResult("TYPE_CANNOT_ORDER_FORUMS");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CATEGORIES_ORDERED = new ImmutableResult("TYPE_CATEGORIES_ORDERED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_ORDER_CATEGORIES = new ImmutableResult("TYPE_CANNOT_ORDER_CATEGORIES");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CATEGORY_UPDATED = new ImmutableResult("TYPE_CATEGORY_UPDATED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FORUM_UPDATED = new ImmutableResult("TYPE_FORUM_UPDATED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOPICS_REMOVED = new ImmutableResult("TYPE_TOPICS_REMOVED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_REMOVE_TOPICS = new ImmutableResult("TYPE_CANNOT_REMOVE_TOPICS");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOPIC_MOVED = new ImmutableResult("TYPE_TOPIC_MOVED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_MOVE_TOPIC = new ImmutableResult("TYPE_CANNOT_MOVE_TOPIC");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOPIC_LOCKED = new ImmutableResult("TYPE_TOPIC_LOCKED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOPIC_UNLOCKED = new ImmutableResult("TYPE_TOPIC_UNLOCKED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_LOCK_TOPIC_MOVED = new ImmutableResult("TYPE_CANNOT_LOCK_TOPIC_MOVED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOPIC_SPLITED = new ImmutableResult("TYPE_TOPIC_SPLITED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_SPLIT_TOPIC = new ImmutableResult("TYPE_CANNOT_SPLIT_TOPIC");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NEW_TOPIC_POSTED = new ImmutableResult("TYPE_NEW_TOPIC_POSTED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_EDIT_POST_POSTED = new ImmutableResult("TYPE_EDIT_POST_POSTED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_REPOSTED = new ImmutableResult("TYPE_REPOSTED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_REPLY_POSTED = new ImmutableResult("TYPE_REPLY_POSTED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NO_SUCH_FORUM = new ImmutableResult("TYPE_NO_SUCH_FORUM");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NO_SUCH_TOPIC = new ImmutableResult("TYPE_NO_SUCH_TOPIC");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NO_SUCH_POST = new ImmutableResult("TYPE_NO_SUCH_POST");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_QUERY = new ImmutableResult("TYPE_CANNOT_QUERY");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_INVALID_POST_SUBJECT = new ImmutableResult("TYPE_INVALID_POST_SUBJECT");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_INVALID_POST_MESSAGE = new ImmutableResult("TYPE_INVALID_POST_MESSAGE");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_INVALID_POLL_TITLE = new ImmutableResult("TYPE_INVALID_POLL_TITLE");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOO_FEW_POLL_OPTION = new ImmutableResult("TYPE_TOO_FEW_POLL_OPTION");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_TOO_MANY_POLL_OPTION = new ImmutableResult("TYPE_TOO_MANY_POLL_OPTION");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_INVALID_POLL_OPTION = new ImmutableResult("TYPE_INVALID_POLL_OPTION");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_FLOODING_CANNOT_CREATE = new ImmutableResult("TYPE_FLOODING_CANNOT_CREATE");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_COULD_NOT_OBTAIN_VOTE_DATA = new ImmutableResult("TYPE_COULD_NOT_OBTAIN_VOTE_DATA");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_NOT_SELECTED_VOTE = new ImmutableResult("TYPE_NOT_SELECTED_VOTE");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_ADD_ATTACHMENT = new ImmutableResult("TYPE_CANNOT_ADD_ATTACHMENT");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_CANNOT_DELETE_ATTACHMENT = new ImmutableResult("TYPE_CANNOT_DELETE_ATTACHMENT");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_ERROR_IN_DELETING_ATTACHMENT = new ImmutableResult("TYPE_ERROR_IN_DELETING_ATTACHMENT");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    ImmutableResult TYPE_VOTE_POSTED = new ImmutableResult("TYPE_VOTE_POSTED");
 
 }
\ No newline at end of file

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,14 +33,14 @@
  *****************************************/
 package org.jboss.portlet.forums.commands;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-
 import org.jboss.portlet.forums.command.Command;
 import org.jboss.portlet.forums.command.Configurator;
 import org.jboss.portlet.forums.command.EmptyConfigurator;
 import org.jboss.portlet.forums.command.result.Result;
 
+import java.util.Iterator;
+import java.util.LinkedList;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeResult.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/CompositeResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,13 @@
  *****************************************/
 package org.jboss.portlet.forums.commands;
 
+import org.jboss.portlet.forums.command.result.Result;
+import org.jboss.portlet.forums.command.result.ResultType;
+
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.result.ResultType;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/SimpleResultType.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/SimpleResultType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/SimpleResultType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -19,14 +42,10 @@
 public class SimpleResultType
    extends ResultType
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final ResultType TYPE_POST_DELETED = new SimpleResultType("TYPE_POST_DELETED");
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final ResultType TYPE_COMPOSITE = new SimpleResultType("TYPE_COMPOSITE");
 
    private SimpleResultType(String name)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/ValidationException.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/ValidationException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/ValidationException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateCategoryCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateCategoryCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateCategoryCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,12 +33,12 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -25,14 +48,10 @@
 public class CreateCategoryCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String name;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public CreateCategoryCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateForumCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateForumCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/CreateForumCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,13 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.model.Category;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -26,24 +49,16 @@
 public class CreateForumCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String name;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String description;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Category category;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public CreateForumCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteCategoryCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteCategoryCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteCategoryCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteForumCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteForumCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteForumCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,13 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 import org.jboss.util.collection.CompoundIterator;
 
 /**
@@ -28,14 +51,10 @@
 public class DeleteForumCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Forum forum;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public DeleteForumCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveCategoryCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveCategoryCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveCategoryCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,13 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.forums.model.*;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.model.Category;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -27,19 +50,13 @@
 public class DeleteMoveCategoryCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Category source;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Category target;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public DeleteMoveCategoryCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveForumCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveForumCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/DeleteMoveForumCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,17 +33,18 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import java.util.Iterator;
-import java.util.ArrayList;
-
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.forums.model.*;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Topic;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -30,19 +54,13 @@
 public class DeleteMoveForumCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Forum source;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Forum target;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public DeleteMoveForumCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderCategoryCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderCategoryCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderCategoryCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,16 +33,16 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import java.util.Iterator;
-
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.model.Category;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
+import java.util.Iterator;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -27,19 +50,13 @@
 public class OrderCategoryCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int move;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Category category;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public OrderCategoryCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderForumCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderForumCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/OrderForumCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,16 +33,16 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
-import java.util.Iterator;
-
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
+import java.util.Iterator;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -28,19 +51,13 @@
 public class OrderForumCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int move;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Forum forum;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule module;
 
    public OrderForumCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateCategoryCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateCategoryCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateCategoryCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,11 +33,11 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.model.Category;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -24,14 +47,10 @@
 public class UpdateCategoryCommand
    extends AbstractCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Category category;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String title;
 
    public UpdateCategoryCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateForumCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateForumCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/admin/UpdateForumCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,12 +33,12 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.admin;
 
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.model.Category;
 import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -25,24 +48,16 @@
 public class UpdateForumCommand
    extends AbstractCommand
 {
-   /**
-    * Name of the forum
-    */
+   /** Name of the forum */
    public String name;
 
-   /**
-    * Description of the forum
-    */
+   /** Description of the forum */
    public String description;
 
-   /**
-    * Cagtegory of the forum
-    */
+   /** Cagtegory of the forum */
    public Category category;
 
-   /**
-    * Forum to edit
-    */
+   /** Forum to edit */
    public Forum forum;
 
    public UpdateForumCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/DeleteTopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/DeleteTopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/DeleteTopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,17 +33,17 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.moderation;
 
-import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.commands.AbstractCommand;
+import org.jboss.portlet.forums.model.Topic;
 
+import java.util.Collection;
 import java.util.Iterator;
-import java.util.Collection;
 
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/LockTopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/LockTopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/LockTopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,18 +33,18 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.moderation;
 
-import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.forums.model.Topic;
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsConstants;
 import org.jboss.portlet.forums.ForumsModule;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.commands.AbstractCommand;
+import org.jboss.portlet.forums.model.Topic;
 
+import java.util.Collection;
 import java.util.Iterator;
-import java.util.Collection;
 
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/MoveTopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/MoveTopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/MoveTopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,18 +33,18 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.moderation;
 
-import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.commands.AbstractCommand;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Topic;
 
+import java.util.Collection;
 import java.util.Iterator;
-import java.util.Collection;
 
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/SplitTopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/SplitTopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/moderation/SplitTopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,20 +33,20 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.moderation;
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.CommandException;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
-import org.jboss.portlet.forums.model.Topic;
+import org.jboss.portlet.forums.impl.TopicImpl;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.Post;
-import org.jboss.portlet.forums.ForumsModule;
-import org.jboss.portlet.forums.impl.TopicImpl;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
-import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.model.Topic;
 
+import java.util.Collection;
 import java.util.Iterator;
-import java.util.Collection;
 
 
 /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePollCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePollCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePollCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,12 +34,12 @@
 package org.jboss.portlet.forums.commands.post;
 
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.commands.ValidationException;
 import org.jboss.portlet.forums.model.AuthType;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePostCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePostCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/DeletePostCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,14 +34,14 @@
 package org.jboss.portlet.forums.commands.post;
 
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.command.result.SimpleResult;
-import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.commands.ValidationException;
+import org.jboss.portlet.forums.model.AuthType;
 import org.jboss.portlet.forums.model.Post;
-import org.jboss.portlet.forums.model.AuthType;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -28,14 +51,10 @@
 public class DeletePostCommand
    extends PostCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean pd_first_post;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean pd_last_post;
 
    public DeletePostCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/EditPostCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/EditPostCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/EditPostCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,17 +33,21 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.post;
 
-import java.util.*;
-
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.commands.ValidationException;
+import org.jboss.portlet.forums.model.Attachment;
 import org.jboss.portlet.forums.model.AuthType;
 import org.jboss.portlet.forums.model.PollOption;
-import org.jboss.portlet.forums.model.Attachment;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at users.sourceforge.net">Thomas Heute</a>
@@ -30,44 +57,28 @@
 public class EditPostCommand
    extends PostCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int topic_type;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Date current_time;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean notify;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean poll_delete;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean pd_first_post;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean pd_last_post;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean pd_edit_poll;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    //public Integer[] deletedAttachments;
    public List deletedAttachments;
 
@@ -237,22 +248,23 @@
       post.setEditCount(post.getEditCount() + 1);
       post.setEditDate(new Date());
       //remove existing attachments + update comments
-      attachmentsLoop: for(Iterator i = post.getAttachments().iterator();i.hasNext();)
+      attachmentsLoop:
+      for (Iterator i = post.getAttachments().iterator(); i.hasNext();)
       {
          Attachment attachment = (Attachment)i.next();
-         for(Iterator j = deletedAttachments.iterator();j.hasNext();)
+         for (Iterator j = deletedAttachments.iterator(); j.hasNext();)
          {
             Integer index = (Integer)j.next();
-            if(attachment.getId().intValue() == index.intValue())
+            if (attachment.getId().intValue() == index.intValue())
             {
                i.remove();
                continue attachmentsLoop;
             }
          }
-         for(Iterator j = updatedAttachments.keySet().iterator();j.hasNext();)
+         for (Iterator j = updatedAttachments.keySet().iterator(); j.hasNext();)
          {
             Integer index = (Integer)j.next();
-            if(attachment.getId().intValue() == index.intValue())
+            if (attachment.getId().intValue() == index.intValue())
             {
                attachment.setComment((String)updatedAttachments.get(index));
                break;
@@ -260,14 +272,11 @@
          }
       }
       //and add new uploaded files
-      for (Iterator i = attachments.iterator();i.hasNext(); )
+      for (Iterator i = attachments.iterator(); i.hasNext();)
       {
          post.addAttachment((Attachment)i.next());
       }
 
-
-
-
       /*
         try
         {

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ForumCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ForumCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ForumCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,10 +33,12 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.post;
 
-import org.jboss.portlet.forums.command.result.Result;
+import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.identity.User;
-import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.AbstractCommand;
 import org.jboss.portlet.forums.commands.ValidationException;
 import org.jboss.portlet.forums.model.Category;
@@ -21,8 +46,6 @@
 import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Poll;
 import org.jboss.portlet.forums.model.Poster;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -51,54 +74,36 @@
       public boolean isAuthAttachments;
     */
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int forumId;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public User currentUser;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Forum forum;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Category category;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Poster poster;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Message message;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Poll poll;
 
    //   public UploadedFile[] attachments;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public ForumsModule forumsModule;
    private String category_title;
    private String forum_name;
    private int forum_status;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected void find()
    {
       try

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/NewTopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/NewTopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/NewTopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,11 +33,11 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.post;
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.ForumsConstants;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.ValidationException;
 import org.jboss.portlet.forums.model.Post;
 
@@ -30,24 +53,16 @@
 public final class NewTopicCommand
    extends ForumCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Date current_time;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int topic_type;
 
-   /**
-    * Notification when someone replies
-    */
+   /** Notification when someone replies */
    public boolean notify;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Post post;
 
    public List attachments;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,9 +34,9 @@
 package org.jboss.portlet.forums.commands.post;
 
 import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.model.Post;
 
 import java.util.List;
 
@@ -30,21 +53,15 @@
       super(request, response);
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int postId;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Post post;
 
    public List attachments;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected void find()
    {
       try

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostTools.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostTools.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/PostTools.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,14 +33,14 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.post;
 
-import java.util.Iterator;
-
 import org.jboss.portlet.forums.commands.CommandConstants;
 import org.jboss.portlet.forums.commands.ValidationException;
 import org.jboss.portlet.forums.helper.ForumsTools;
 import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Poll;
 
+import java.util.Iterator;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ReplyCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ReplyCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/ReplyCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,16 +33,16 @@
  *****************************************/
 package org.jboss.portlet.forums.commands.post;
 
-import java.util.Date;
-
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.ForumsConstants;
 import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.ValidationException;
+import org.jboss.portlet.forums.model.AuthType;
 import org.jboss.portlet.forums.model.Post;
-import org.jboss.portlet.forums.model.AuthType;
-import org.jboss.portlet.forums.ForumsConstants;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
+import java.util.Date;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -27,19 +50,13 @@
 public final class ReplyCommand
    extends PostCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Post newPost;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Date current_time;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public boolean notify;
 
    public ReplyCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/RepostCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/RepostCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/RepostCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,11 +34,11 @@
 package org.jboss.portlet.forums.commands.post;
 
 
+import org.jboss.portlet.JBossActionRequest;
+import org.jboss.portlet.JBossActionResponse;
 import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.CommandConstants;
 import org.jboss.portlet.forums.model.AuthType;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossActionResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/TopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/TopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/TopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -14,9 +37,9 @@
 //import org.jboss.nukes.addons.modules.bb.ejb.TopicEJBLocal;
 //import org.jboss.nukes.addons.modules.bb.BBConstants;
 
-import org.jboss.portlet.forums.model.Topic;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.model.Topic;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -31,14 +54,10 @@
       super(request, response);
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int topicId;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Topic topic;
 
    /*

Modified: trunk/forums/src/main/org/jboss/portlet/forums/commands/post/VoteTopicCommand.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/commands/post/VoteTopicCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/commands/post/VoteTopicCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,11 +34,14 @@
 package org.jboss.portlet.forums.commands.post;
 
 
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portlet.forums.model.*;
 import org.jboss.portlet.JBossActionRequest;
 import org.jboss.portlet.JBossActionResponse;
+import org.jboss.portlet.forums.command.result.Result;
+import org.jboss.portlet.forums.model.AuthType;
+import org.jboss.portlet.forums.model.Poll;
+import org.jboss.portlet.forums.model.PollOption;
+import org.jboss.portlet.forums.model.Post;
 
 import java.util.Iterator;
 
@@ -27,14 +53,10 @@
 public class VoteTopicCommand
    extends TopicCommand
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public Post post;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public int voteOptionId;
 
    public VoteTopicCommand(JBossActionRequest request, JBossActionResponse response)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentToken.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentToken.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentToken.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -81,6 +104,7 @@
 
    /**
     * compares createDate and expirationDate
+    *
     * @return
     */
    public boolean isValid()

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentTokenManager.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentTokenManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/AttachmentTokenManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -8,10 +31,10 @@
  *****************************************/
 package org.jboss.portlet.forums.helper;
 
+import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
-import java.util.Iterator;
-import java.util.Date;
 
 /**
  * Manager that stores and manages AttachmentToken object instances inside of session.
@@ -31,8 +54,8 @@
    private int idCount;
 
    /**
-    * Method adds new AttachmentToken into store. If there is one with same attachmentId already
-    * it'll be replaced by the new one
+    * Method adds new AttachmentToken into store. If there is one with same attachmentId already it'll be replaced by
+    * the new one
     *
     * @param newToken
     */
@@ -78,6 +101,7 @@
 
    /**
     * returns token
+    *
     * @param id
     * @return
     */
@@ -96,8 +120,6 @@
    }
 
 
-
-
    /**
     * new Tokens chould be obtained with this method to generate proper Id safely
     *
@@ -130,9 +152,7 @@
    }
 
 
-   /**
-    * Validates all tokens.
-    */
+   /** Validates all tokens. */
    public synchronized void removeExpiredTokens()
    {
       for (Iterator i = tokens.iterator(); i.hasNext();)

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/FileBinding.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/FileBinding.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/FileBinding.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/ForumsTools.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/ForumsTools.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/ForumsTools.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,6 +33,23 @@
  *****************************************/
 package org.jboss.portlet.forums.helper;
 
+import org.apache.log4j.Logger;
+import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Query;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.JBossRenderRequest;
+import org.jboss.portlet.forums.ForumsConstants;
+import org.jboss.portlet.forums.ForumsModule;
+import org.jboss.portlet.forums.model.Category;
+import org.jboss.portlet.forums.model.Forum;
+
+import javax.ejb.EJBLocalHome;
+import javax.ejb.EJBLocalObject;
+import javax.portlet.PortletRequest;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -23,24 +63,6 @@
 import java.util.List;
 import java.util.ResourceBundle;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.EJBLocalObject;
-import javax.portlet.PortletRequest;
-
-import org.apache.log4j.Logger;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.queryParser.ParseException;
-import org.apache.lucene.queryParser.QueryParser;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Query;
-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portlet.forums.ForumsConstants;
-import org.jboss.portlet.forums.ForumsModule;
-import org.jboss.portlet.forums.model.Category;
-import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.JBossRenderRequest;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -361,9 +383,7 @@
       return selectDays.toString();
    }
 
-   /**
-    * Performs a generic batch update.
-    */
+   /** Performs a generic batch update. */
    public static void batchUpdate(Connection conn,
                                   String updateQuery,
                                   String selectQuery,

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/Goto.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/Goto.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/Goto.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -174,7 +197,7 @@
    protected final void lastNormal(StringBuffer buffer,
                                    int index)
    {
-      buffer.append("<a href=\"").append(url).append("&t=").append(topicId) .append("&start=")
+      buffer.append("<a href=\"").append(url).append("&t=").append(topicId).append("&start=")
          .append(index * postsPerPage).append("\">").append(index + 1).append("</a>");
       /*buffer.append("<a href=\"index.html?module=bb&op=viewtopic&t=").append(topicId).append("&start=")
          .append(index * postsPerPage).append("\">").append(index + 1).append("</a>");*/

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/GotoWithOffset.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/GotoWithOffset.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/GotoWithOffset.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/IndexIterator.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/IndexIterator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/IndexIterator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -68,9 +91,7 @@
       return iterator.next();
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void remove()
    {
       iterator.remove();

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/Range.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/Range.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/Range.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -33,92 +56,68 @@
       this.right = right;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected final int left;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected final int middle;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    protected final int right;
 
-   /**
-    * Begin the generated string.
-    */
+   /** Begin the generated string. */
    protected void start(StringBuffer buffer)
    {
       buffer.append("[");
    }
 
-   /**
-    * End the generated string.
-    */
+   /** End the generated string. */
    protected void end(StringBuffer buffer)
    {
       buffer.append("]");
    }
 
-   /**
-    * Generates a non last normal item.
-    */
+   /** Generates a non last normal item. */
    protected void normal(StringBuffer buffer,
                          int index)
    {
       buffer.append(index).append(",");
    }
 
-   /**
-    * Generates a last normal item.
-    */
+   /** Generates a last normal item. */
    protected void lastNormal(StringBuffer buffer,
                              int index)
    {
       buffer.append(index);
    }
 
-   /**
-    * Generates a non last enhanced item.
-    */
+   /** Generates a non last enhanced item. */
    protected void enhanced(StringBuffer buffer,
                            int index)
    {
       buffer.append("-").append(index).append("-,");
    }
 
-   /**
-    * Generates a last enhanced item.
-    */
+   /** Generates a last enhanced item. */
    protected void lastEnhanced(StringBuffer buffer,
                                int index)
    {
       buffer.append("-").append(index).append("-");
    }
 
-   /**
-    * Generates a gap.
-    */
+   /** Generates a gap. */
    protected void gap(StringBuffer buffer)
    {
       buffer.append(" ... ");
    }
 
-   /**
-    * Generates a separator.
-    */
+   /** Generates a separator. */
    protected void separe(StringBuffer buffer)
    {
       buffer.append(", ");
    }
 
-   /**
-    * Do the job.
-    */
+   /** Do the job. */
    protected final String build(int size,
                                 int offset)
    {

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/TempFileBinding.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/TempFileBinding.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/TempFileBinding.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,20 +34,17 @@
 
 package org.jboss.portlet.forums.helper;
 
+import org.jboss.portlet.forums.impl.AttachmentImpl;
+import org.jboss.portlet.forums.impl.UploadedFileImpl;
+import org.jboss.portlet.forums.model.Attachment;
 import org.jboss.portlet.forums.model.UploadedFile;
-import org.jboss.portlet.forums.model.Attachment;
-import org.jboss.portlet.forums.impl.UploadedFileImpl;
-import org.jboss.portlet.forums.impl.AttachmentImpl;
-import org.hibernate.Hibernate;
 
-import java.io.IOException;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.sql.Blob;
-import java.sql.SQLException;
 
 
 /**
@@ -42,6 +62,7 @@
 
    /**
     * Creates TempFileBinding. Content will be strored in temporary file using File.createTempFile
+    *
     * @param contentType
     * @param content
     * @param name
@@ -61,9 +82,7 @@
       fo.close();
    }
 
-   /**
-    * Deletes stored on disk file.
-    */
+   /** Deletes stored on disk file. */
    public void delete()
    {
       File file = new File(filePath);
@@ -96,6 +115,7 @@
 
    /**
     * produces UploadedFile from stored on disk file.
+    *
     * @return
     */
    public UploadedFile produceUploadedFile()
@@ -121,6 +141,7 @@
 
    /**
     * produces Attachment object form stored on disk file
+    *
     * @return
     */
    public Attachment produceAttachment()

Modified: trunk/forums/src/main/org/jboss/portlet/forums/helper/Time.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/helper/Time.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/helper/Time.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -18,34 +41,22 @@
  */
 public class Time
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int SAME_DATE = 0x01;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int LEFT_NULL = 0x02;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int RIGHT_NULL = 0x04;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int BOTH_NULL = 0x08;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int LEFT_AFTER = 0x10;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int RIGHT_AFTER = 0x20;
 
    /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/AttachmentImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -12,16 +35,16 @@
 package org.jboss.portlet.forums.impl;
 
 import org.jboss.portlet.forums.model.Attachment;
+import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.UploadedFile;
-import org.jboss.portlet.forums.model.Post;
 
 import java.io.Serializable;
 
 /**
  * Created on 29 juil. 2004
+ *
  * @author theute
- * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
- * $Revision$
+ * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a> $Revision$
  * @hibernate.class table="jbp_forums_attachments"
  */
 public class AttachmentImpl implements Attachment, Serializable
@@ -37,37 +60,31 @@
 
    }
 
-   /**
-    * @hibernate.property column="jbp_comment"
-    * type="text"
-    */
-   public String getComment() {
+   /** @hibernate.property column="jbp_comment" type="text" */
+   public String getComment()
+   {
       return comment;
    }
-   /**
-    * @param comment The comment to set.
-    */
-   public void setComment(String comment) {
+
+   /** @param comment The comment to set. */
+   public void setComment(String comment)
+   {
       this.comment = comment;
    }
 
-   /**
-    * @hibernate.component class="org.jboss.portlet.forums.impl.UploadedFileImpl"
-    */
-   public UploadedFile getFile() {
+   /** @hibernate.component class="org.jboss.portlet.forums.impl.UploadedFileImpl" */
+   public UploadedFile getFile()
+   {
       return file;
    }
-   /**
-    * @param file The file to set.
-    */
-   public void setFile(UploadedFile file) {
+
+   /** @param file The file to set. */
+   public void setFile(UploadedFile file)
+   {
       this.file = file;
    }
 
-   /**
-    * @hibernate.id column="jbp_attachment_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_attachment_id" generator-class="native" */
    public Integer getId()
    {
       return id;
@@ -78,10 +95,7 @@
       this.id = id;
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_post_id"
-    * class="org.jboss.portlet.forums.impl.PostImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_post_id" class="org.jboss.portlet.forums.impl.PostImpl" */
    public Post getPost()
    {
       return post;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/CategoryImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,13 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
+import org.jboss.portlet.forums.model.Category;
+import org.jboss.portlet.forums.model.Forum;
+
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
-import org.jboss.portlet.forums.model.Category;
-import org.jboss.portlet.forums.model.Forum;
-
 /**
  * Category of forums.
  *
@@ -35,19 +58,14 @@
    private String title;
    private Integer id;
 
-   /**
-    * Creates a new {@link CategoryImpl} object.
-    */
+   /** Creates a new {@link CategoryImpl} object. */
    public CategoryImpl()
    {
       setForums(new ArrayList());
    }
 
    /**
-    * @hibernate.bag lazy="true"
-    * inverse="true"
-    * cascade="all-delete-orphan"
-    * order-by="jbp_order asc"
+    * @hibernate.bag lazy="true" inverse="true" cascade="all-delete-orphan" order-by="jbp_order asc"
     * table="jbp_forums_forums"
     * @hibernate.collection-key column="jbp_category_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.ForumImpl"
@@ -78,11 +96,7 @@
       forums.add(value);
    }
 
-   /**
-    * @hibernate.property column="jbp_order"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_order" unique="false" update="true" */
    public int getOrder()
    {
       return order;
@@ -98,11 +112,7 @@
       this.order = order;
    }
 
-   /**
-    * @hibernate.property column="jbp_title"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_title" unique="false" update="true" */
    public String getTitle()
    {
       return title;
@@ -118,10 +128,7 @@
       this.title = title;
    }
 
-   /**
-    * @hibernate.id column="jbp_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_id" generator-class="native" */
    public Integer getId()
    {
       return id;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,17 +33,17 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-
 import org.jboss.portlet.forums.model.Category;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.Topic;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * Category of forums.
  *
@@ -34,9 +57,7 @@
    implements Serializable,
    Forum
 {
-   /**
-    * Creates a new {@link ForumImpl} object.
-    */
+   /** Creates a new {@link ForumImpl} object. */
    public ForumImpl()
    {
       setTopics(new ArrayList());
@@ -58,10 +79,7 @@
    //private int        type;
    private List watches;
 
-   /**
-    * @hibernate.many-to-one column="jbp_category_id"
-    * class="org.jboss.portlet.forums.impl.CategoryImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_category_id" class="org.jboss.portlet.forums.impl.CategoryImpl" */
    public Category getCategory()
    {
       return category;
@@ -77,11 +95,7 @@
       this.category = category;
    }
 
-   /**
-    * @hibernate.property column="jbp_description"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_description" unique="false" update="true" */
    public String getDescription()
    {
       return description;
@@ -97,10 +111,7 @@
       this.description = description;
    }
 
-   /**
-    * @hibernate.id column="jbp_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_id" generator-class="native" */
    public Integer getId()
    {
       return id;
@@ -111,12 +122,7 @@
       this.id = id;
    }
 
-   /**
-    * _ at _hibernate.many-to-one
-    * _cascade_="all"
-    * _column_="jbp_last_post_id"
-    * _class_="org.jboss.portlet.forums.impl.PostImpl"
-    */
+   /** _ at _hibernate.many-to-one _cascade_="all" _column_="jbp_last_post_id" _class_="org.jboss.portlet.forums.impl.PostImpl" */
    public Post getLastPost()
    {
       Post post = null;
@@ -138,11 +144,7 @@
       //this.lastPost = lastPost;
    }
 
-   /**
-    * @hibernate.property column="jbp_name"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_name" unique="false" update="true" */
    public String getName()
    {
       return name;
@@ -158,11 +160,7 @@
       this.name = name;
    }
 
-   /**
-    * @hibernate.property column="jbp_order"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_order" unique="false" update="true" */
    public int getOrder()
    {
       return order;
@@ -178,11 +176,7 @@
       this.order = order;
    }
 
-   /**
-    * @hibernate.property column="jbp_topic_count"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_topic_count" unique="false" update="true" */
    public int getTopicCount()
    {
       //return topicCount;
@@ -199,19 +193,13 @@
       //this.topicCount = size;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void addTopicSize()
    {
       //setTopicCount(topicCount + 1);
    }
 
-   /**
-    * @hibernate.property column="jbp_post_count"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_post_count" unique="false" update="true" */
    public int getPostCount()
    {
       int sum = 0;
@@ -234,19 +222,13 @@
       //this.postCount = size;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void addPostSize()
    {
       //setPostCount(postCount + 1);
    }
 
-   /**
-    * _ at ___ hibernate.property column="jbp_prune_enable"
-    * unique="false"
-    * update="true"
-    */
+   /** _ at ___ hibernate.property column="jbp_prune_enable" unique="false" update="true" */
    public boolean getPruneEnable()
    {
       //return pruneEnable;
@@ -263,11 +245,7 @@
       //this.pruneEnable = enable;
    }
 
-   /**
-    * _ at ___ hibernate.property column="jbp_prune_next"
-    * unique="false"
-    * update="true"
-    */
+   /** _ at ___ hibernate.property column="jbp_prune_next" unique="false" update="true" */
    public int getPruneNext()
    {
       //return pruneNext;
@@ -284,11 +262,7 @@
       //this.pruneNext = next;
    }
 
-   /**
-    * @hibernate.property column="jbp_status"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_status" unique="false" update="true" */
    public int getStatus()
    {
       return status;
@@ -305,10 +279,7 @@
    }
 
    /**
-    * @hibernate.bag lazy="true"
-    * inverse="true"
-    * cascade="all-delete-orphan"
-    * order-by="jbp_last_post_date asc"
+    * @hibernate.bag lazy="true" inverse="true" cascade="all-delete-orphan" order-by="jbp_last_post_date asc"
     * table="jbp_forums_topics"
     * @hibernate.collection-key column="jbp_forum_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.TopicImpl"
@@ -341,9 +312,7 @@
    }
 
    /**
-    * @hibernate.bag lazy="true"
-    * inverse="true"
-    * cascade="all"
+    * @hibernate.bag lazy="true" inverse="true" cascade="all"
     * @hibernate.collection-key column="jbp_forum_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.ForumWatchImpl"
     */
@@ -383,9 +352,7 @@
    }*/
 
    /**
-    * @hibernate.bag lazy="true"
-    * inverse="true"
-    * cascade="all"
+    * @hibernate.bag lazy="true" inverse="true" cascade="all"
     * @hibernate.collection-key column="jbp_forum_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.ForumWatchImpl"
     */

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumWatchImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,13 +33,12 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
-import java.io.Serializable;
-
 import org.jboss.portal.identity.User;
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.model.ForumWatch;
-import org.jboss.portlet.forums.model.Poster;
 
+import java.io.Serializable;
+
 /**
  * Watchers of forums.
  *
@@ -34,17 +56,12 @@
    private Forum forum;
    //private int     mode;
 
-   /**
-    * Creates a new {@link ForumWatchImpl} object.
-    */
+   /** Creates a new {@link ForumWatchImpl} object. */
    public ForumWatchImpl()
    {
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_forum_id"
-    * class="org.jboss.portlet.forums.impl.ForumImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_forum_id" class="org.jboss.portlet.forums.impl.ForumImpl" */
    public Forum getForum()
    {
       return forum;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,40 +34,40 @@
 package org.jboss.portlet.forums.impl;
 
 import org.apache.log4j.Logger;
+import org.hibernate.HibernateException;
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portlet.forums.command.ActionCommand;
-import org.jboss.portlet.forums.command.filter.CompositeFilter;
-import org.jboss.portlet.forums.command.filter.ExecuteFilter;
-import org.jboss.portlet.forums.command.filter.CommandFilter;
+import org.jboss.portal.core.modules.AbstractModule;
+import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.identity.User;
-import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.core.modules.AbstractModule;
 import org.jboss.portal.jems.hibernate.HibernateProvider;
 import org.jboss.portlet.forums.ForumsConstants;
 import org.jboss.portlet.forums.ForumsModule;
-import org.jboss.portlet.forums.model.Poster;
+import org.jboss.portlet.forums.command.ActionCommand;
+import org.jboss.portlet.forums.command.CommandException;
+import org.jboss.portlet.forums.command.filter.CommandFilter;
+import org.jboss.portlet.forums.command.filter.CompositeFilter;
+import org.jboss.portlet.forums.command.filter.ExecuteFilter;
+import org.jboss.portlet.forums.command.result.Result;
+import org.jboss.portlet.forums.interceptors.FloodControlInterceptor;
+import org.jboss.portlet.forums.model.Attachment;
+import org.jboss.portlet.forums.model.Category;
 import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.ForumWatch;
+import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Poll;
 import org.jboss.portlet.forums.model.Post;
-import org.jboss.portlet.forums.model.Message;
+import org.jboss.portlet.forums.model.Poster;
 import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Category;
-import org.jboss.portlet.forums.model.ForumWatch;
+import org.jboss.portlet.forums.model.TopicWatch;
 import org.jboss.portlet.forums.model.Watch;
-import org.jboss.portlet.forums.model.TopicWatch;
-import org.jboss.portlet.forums.model.Attachment;
-import org.jboss.portlet.forums.interceptors.FloodControlInterceptor;
-import org.hibernate.Session;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.SessionFactory;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
@@ -67,10 +90,10 @@
 
    private String fromAddress;
 
-// private final ResourceCacheInvalidatorInterceptor resourceInterceptor;
-// private final IndexInterceptor indexInterceptor;
+   // private final ResourceCacheInvalidatorInterceptor resourceInterceptor;
+   // private final IndexInterceptor indexInterceptor;
    private CompositeFilter compositeInterceptor;
-// private NotificationInterceptor notificationInterceptor;
+   // private NotificationInterceptor notificationInterceptor;
    private FloodControlInterceptor floodControlInterceptor;
    private ExecuteFilter executeInterceptor;
    private CommandFilter chain;
@@ -101,49 +124,37 @@
       floodControlInterceptor.setNext(executeInterceptor);
    }
 
-   /**
-    * @jmx.managed-attribute
-    */
+   /** @jmx.managed-attribute */
    public HibernateProvider getHibernate()
    {
       return hibernate;
    }
 
-   /**
-    * @jmx.managed-attribute
-    */
+   /** @jmx.managed-attribute */
    public void setHibernate(HibernateProvider hibernate)
    {
       this.hibernate = hibernate;
    }
 
-   /**
-    * @jmx.managed-attribute
-    */
+   /** @jmx.managed-attribute */
    public int getFloodInterval()
    {
       return floodInterval;
    }
 
-   /**
-    * @jmx.managed-attribute
-    */
+   /** @jmx.managed-attribute */
    public void setFloodInterval(int floodInterval)
    {
       this.floodInterval = floodInterval;
    }
 
-   /**
-    * @jmx.managed-attribute
-    */
+   /** @jmx.managed-attribute */
    public String getFromAddress()
    {
       return fromAddress;
    }
 
-   /**
-    * @jmx.managed-attribute
-    */
+   /** @jmx.managed-attribute */
    public void setFromAddress(String fromAddress)
    {
       this.fromAddress = fromAddress;
@@ -519,7 +530,6 @@
          session.save(poster);
          session.save(poll);
 
-         
 
          PostImpl post = new PostImpl();
          post.setMessage(message);
@@ -531,7 +541,7 @@
             Attachment a = (Attachment)i.next();
             session.save(a);
             post.addAttachment(a);
-         }                 
+         }
          session.save(post);
 
          TopicImpl topic = new TopicImpl();
@@ -1317,8 +1327,9 @@
       //throw new UnsupportedOperationException();
       return chain.filter(cmd);
    }
-   
-   protected Session getSession () {
-       return factory.getCurrentSession();
+
+   protected Session getSession()
+   {
+      return factory.getCurrentSession();
    }
 }
\ No newline at end of file

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/MessageImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,10 +33,10 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
+import org.jboss.portlet.forums.model.Message;
+
 import java.io.Serializable;
 
-import org.jboss.portlet.forums.model.Message;
-
 /**
  * A DVC object that groups the message informations for a post.
  *
@@ -34,9 +57,7 @@
    private boolean smiliesEnabled = false;
    private boolean signatureEnabled = true;
 
-   /**
-    * @hibernate.property column="jbp_subject"
-    */
+   /** @hibernate.property column="jbp_subject" */
    public String getSubject()
    {
       return subject;
@@ -52,10 +73,7 @@
       this.subject = subject;
    }
 
-   /**
-    * @hibernate.property column="jbp_text"
-    * type="text"
-    */
+   /** @hibernate.property column="jbp_text" type="text" */
    public String getText()
    {
       return text;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/PollImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,12 +33,17 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
-import java.io.Serializable;
-import java.util.*;
-
 import org.jboss.portlet.forums.model.Poll;
 import org.jboss.portlet.forums.model.PollOption;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet </a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
@@ -27,9 +55,7 @@
    implements Serializable,
    Poll
 {
-   /**
-    * Creates a new {@link PollImpl} object.
-    */
+   /** Creates a new {@link PollImpl} object. */
    public PollImpl()
    {
       setOptions(new LinkedList());
@@ -44,10 +70,7 @@
    private Set voted;
    private Date creationDate;
 
-   /**
-    * @hibernate.id column="jbp_poll_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_poll_id" generator-class="native" */
    public Integer getId()
    {
       return id;
@@ -83,10 +106,7 @@
    }
 
    /**
-    * @hibernate.list lazy="true"
-    * cascade="all"
-    * update="true"
-    * table="jbp_forums_poll_option"
+    * @hibernate.list lazy="true" cascade="all" update="true" table="jbp_forums_poll_option"
     * @hibernate.collection-key column="jbp_poll_id"
     * @hibernate.collection-index column="jbp_poll_option_position"
     * @hibernate.collection-composite-element class="org.jboss.portlet.forums.impl.PollOptionImpl"
@@ -100,19 +120,13 @@
     *    not-null="true"*/
    }
 
-   /**
-    * @hibernate.property column="jbp_title"
-    */
+   /** @hibernate.property column="jbp_title" */
    public String getTitle()
    {
       return this.title;
    }
 
-   /**
-    * @hibernate.property column="jbp_length"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_length" unique="false" update="true" */
    public int getLength()
    {
       return this.length;
@@ -135,13 +149,9 @@
    }*/
 
    /**
-    * @hibernate.set lazy="true"
-    * cascade="all"
-    * table="jbp_forums_poll_voted"
+    * @hibernate.set lazy="true" cascade="all" table="jbp_forums_poll_voted"
     * @hibernate.collection-key column="jbp_poll_id"
-    * @hibernate.collection-element type="integer"
-    * column="jbp_poll_voted"
-    * not-null="true"
+    * @hibernate.collection-element type="integer" column="jbp_poll_voted" not-null="true"
     */
    public Set getVoted()
    {
@@ -163,10 +173,7 @@
       return sum;
    }
 
-   /**
-    * @hibernate.property column="jbp_creation_date"
-    * not-null="true"
-    */
+   /** @hibernate.property column="jbp_creation_date" not-null="true" */
    public Date getCreationDate()
    {
       return creationDate;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/PollOptionImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,11 +34,8 @@
 package org.jboss.portlet.forums.impl;
 
 import org.jboss.portlet.forums.model.PollOption;
-import org.jboss.portlet.forums.model.Poll;
 
 import java.io.Serializable;
-import java.util.List;
-import java.util.Date;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -38,10 +58,7 @@
       setQuestion(question);
    }
 
-   /**
-    * @hibernate.property column="jbp_votes"
-    * not-null="true"
-    */
+   /** @hibernate.property column="jbp_votes" not-null="true" */
    public int getVotes()
    {
       return votes;
@@ -52,10 +69,7 @@
       this.votes = votes;
    }
 
-   /**
-    * @hibernate.property column="jbp_question"
-    * not-null="true"
-    */
+   /** @hibernate.property column="jbp_question" not-null="true" */
    public String getQuestion()
    {
       return question;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/PostImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,18 +33,18 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.LinkedList;
-
 import org.jboss.portal.identity.User;
+import org.jboss.portlet.forums.model.Attachment;
 import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.Poster;
 import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Attachment;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -43,18 +66,13 @@
    private Poster poster;
    private List attachments;
 
-   /**
-    * Creates a new {@link PostImpl} object.
-    */
+   /** Creates a new {@link PostImpl} object. */
    public PostImpl()
    {
       attachments = new LinkedList();
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_topic_id"
-    * class="org.jboss.portlet.forums.impl.TopicImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_topic_id" class="org.jboss.portlet.forums.impl.TopicImpl" */
    public Topic getTopic()
    {
       return topic;
@@ -90,11 +108,7 @@
       this.user = user;
    }
 
-   /**
-    * @hibernate.property column="jbp_edit_count"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_edit_count" unique="false" update="true" */
    public int getEditCount()
    {
       return count;
@@ -110,11 +124,7 @@
       this.count = count;
    }
 
-   /**
-    * @hibernate.property column="jbp_edit_date"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_edit_date" unique="false" update="true" */
    public Date getEditDate()
    {
       return date;
@@ -130,10 +140,7 @@
       this.date = date;
    }
 
-   /**
-    * @hibernate.id column="jbp_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_id" generator-class="native" */
    public Integer getId()
    {
       return id;
@@ -149,11 +156,7 @@
       this.id = id;
    }
 
-   /**
-    * @hibernate.property column="jbp_create_date"
-    * unique="false"
-    * update="false"
-    */
+   /** @hibernate.property column="jbp_create_date" unique="false" update="false" */
    public Date getCreateDate()
    {
       return createDate;
@@ -169,9 +172,7 @@
       this.createDate = createDate;
    }
 
-   /**
-    * @hibernate.component class="org.jboss.portlet.forums.impl.MessageImpl"
-    */
+   /** @hibernate.component class="org.jboss.portlet.forums.impl.MessageImpl" */
    public Message getMessage()
    {
       return message;
@@ -187,10 +188,7 @@
       this.message = message;
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_poster_id"
-    * class="org.jboss.portlet.forums.impl.PosterImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_poster_id" class="org.jboss.portlet.forums.impl.PosterImpl" */
    public Poster getPoster()
    {
       return poster;
@@ -209,10 +207,7 @@
 
    //TODO:BD - order it by something... is name ok?
    /**
-    * @hibernate.bag lazy="true"
-    * cascade="all-delete-orphan"
-    * order-by="jbp_name asc"
-    * inverse="true"
+    * @hibernate.bag lazy="true" cascade="all-delete-orphan" order-by="jbp_name asc" inverse="true"
     * table="jbp_forums_attachments"
     * @hibernate.collection-key column="jbp_post_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.AttachmentImpl"

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/PosterImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,16 +33,15 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.portal.identity.User;
 import org.jboss.portal.core.modules.ModuleConstants;
-import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.User;
 import org.jboss.portal.identity.UserModule;
 import org.jboss.portlet.forums.model.Poster;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -35,9 +57,7 @@
    private User user;
    private int nbPosts = 0;
 
-   /**
-    * Creates a new {@link PosterImpl} object.
-    */
+   /** Creates a new {@link PosterImpl} object. */
    public PosterImpl()
    {
    }
@@ -57,7 +77,7 @@
       if (user == null)
       {
          try
-         {                                
+         {
             UserModule userModule = (UserModule)new InitialContext().lookup(ModuleConstants.USERMODULE_JNDINAME);
             user = userModule.findUserById(userId);
          }
@@ -81,17 +101,14 @@
 
    /**
     * @return Returns the id.
-    * @hibernate.id column="jbp_id"
-    * generator-class="native"
+    * @hibernate.id column="jbp_id" generator-class="native"
     */
    public Integer getId()
    {
       return id;
    }
 
-   /**
-    * @param id The id to set.
-    */
+   /** @param id The id to set. */
    public void setId(Integer id)
    {
       this.id = id;
@@ -101,25 +118,20 @@
     * This column has the unique constraints as it reflects the user id.
     *
     * @return Returns the id.
-    * @hibernate.property column="jbp_user_id"
-    * unique="true"
+    * @hibernate.property column="jbp_user_id" unique="true"
     */
    public String getUserId()
    {
       return userId;
    }
 
-   /**
-    * @param userId The id to set.
-    */
+   /** @param userId The id to set. */
    public void setUserId(String userId)
    {
       this.userId = userId;
    }
 
-   /**
-    * @hibernate.property column="jbp_post_count"
-    */
+   /** @hibernate.property column="jbp_post_count" */
    public int getPostCount()
    {
       return nbPosts;
@@ -130,9 +142,7 @@
       this.nbPosts = nbPosts;
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public void incrementPostCount()
    {
       setPostCount(nbPosts + 1);

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,11 +33,18 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Poll;
+import org.jboss.portlet.forums.model.Post;
+import org.jboss.portlet.forums.model.Poster;
+import org.jboss.portlet.forums.model.Topic;
+
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
 
-import org.jboss.portlet.forums.model.*;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -46,9 +76,7 @@
    private List watches;
    private Poll poll;
 
-   /**
-    * Creates a new {@link TopicImpl} object.
-    */
+   /** Creates a new {@link TopicImpl} object. */
    public TopicImpl()
    {
       setPosts(new ArrayList());
@@ -80,10 +108,7 @@
    }
 
 
-   /**
-    * @hibernate.id column="jbp_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_id" generator-class="native" */
    public Integer getId()
    {
       return id;
@@ -105,10 +130,7 @@
     */
 
    /**
-    * @hibernate.bag lazy="true"
-    * cascade="all-delete-orphan"
-    * order-by="jbp_create_date asc"
-    * inverse="true"
+    * @hibernate.bag lazy="true" cascade="all-delete-orphan" order-by="jbp_create_date asc" inverse="true"
     * table="jbp_forums_posts"
     * @hibernate.collection-key column="jbp_topic_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.PostImpl"
@@ -140,10 +162,7 @@
       posts.add(post);
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_forum_id"
-    * class="org.jboss.portlet.forums.impl.ForumImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_forum_id" class="org.jboss.portlet.forums.impl.ForumImpl" */
    public Forum getForum()
    {
       return forum;
@@ -159,11 +178,7 @@
       this.forum = forum;
    }
 
-   /**
-    * @hibernate.property column="jbp_view_count"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_view_count" unique="false" update="true" */
    public int getViewCount()
    {
       return viewCount;
@@ -179,11 +194,7 @@
       this.viewCount = viewCount;
    }
 
-   /**
-    * @hibernate.property column="jbp_replies"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_replies" unique="false" update="true" */
    public int getReplies()
    {
 
@@ -201,11 +212,7 @@
       //this.replies = replies;
    }
 
-   /**
-    * _ at _hibernate.many-to-one
-    * _column_="jbp_first_post_id"
-    * _class_="org.jboss.portlet.forums.impl.PostImpl"
-    */
+   /** _ at _hibernate.many-to-one _column_="jbp_first_post_id" _class_="org.jboss.portlet.forums.impl.PostImpl" */
    public Post getFirstPost()
    {
       //return firstPost;
@@ -235,11 +242,7 @@
       //this.firstPost = post;
    }
 
-   /**
-    * _ at _hibernate.many-to-one
-    * _column_="jbp_last_post_id"
-    * _class_="org.jboss.portlet.forums.impl.PostImpl"
-    */
+   /** _ at _hibernate.many-to-one _column_="jbp_last_post_id" _class_="org.jboss.portlet.forums.impl.PostImpl" */
    public Post getLastPost()
    {
       //return lastPost;
@@ -266,11 +269,7 @@
       //this.lastPost = post;
    }
 
-   /**
-    * @hibernate.property column="jbp_last_post_date"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_last_post_date" unique="false" update="true" */
    public Date getLastPostDate()
    {
       return lastPostDate;
@@ -297,10 +296,7 @@
       this.lastPostDate = lastPostDate;
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_poster"
-    * class="org.jboss.portlet.forums.impl.PosterImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_poster" class="org.jboss.portlet.forums.impl.PosterImpl" */
    public Poster getPoster()
    {
       return poster;
@@ -316,11 +312,7 @@
       this.poster = poster;
    }
 
-   /**
-    * @hibernate.property column="jbp_type"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_type" unique="false" update="true" */
    public int getType()
    {
       return type;
@@ -336,11 +328,7 @@
       this.type = type;
    }
 
-   /**
-    * @hibernate.property column="jbp_status"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_status" unique="false" update="true" */
    public int getStatus()
    {
       return status;
@@ -376,11 +364,7 @@
       this.target = target;
    }*/
 
-   /**
-    * @hibernate.property column="jbp_subject"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_subject" unique="false" update="true" */
    public String getSubject()
    {
       return subject;
@@ -397,9 +381,7 @@
    }
 
    /**
-    * @hibernate.bag lazy="true"
-    * inverse="true"
-    * cascade="all"
+    * @hibernate.bag lazy="true" inverse="true" cascade="all"
     * @hibernate.collection-key column="jbp_topic_id"
     * @hibernate.collection-one-to-many class="org.jboss.portlet.forums.impl.TopicWatchImpl"
     */
@@ -413,11 +395,7 @@
       this.watches = watches;
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_poll"
-    * class="org.jboss.portlet.forums.impl.PollImpl"
-    * not-null="false"
-    */
+   /** @hibernate.many-to-one column="jbp_poll" class="org.jboss.portlet.forums.impl.PollImpl" not-null="false" */
    public Poll getPoll()
    {
       return poll;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/TopicWatchImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,12 +33,11 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
-import java.io.Serializable;
-
 import org.jboss.portlet.forums.model.Topic;
 import org.jboss.portlet.forums.model.TopicWatch;
-import org.jboss.portlet.forums.model.Poster;
 
+import java.io.Serializable;
+
 /**
  * Watchers of topics.
  *
@@ -33,17 +55,12 @@
 
    private Topic topic;
 
-   /**
-    * Creates a new {@link TopicWatchImpl} object.
-    */
+   /** Creates a new {@link TopicWatchImpl} object. */
    public TopicWatchImpl()
    {
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_topic_id"
-    * class="org.jboss.portlet.forums.impl.TopicImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_topic_id" class="org.jboss.portlet.forums.impl.TopicImpl" */
    public Topic getTopic()
    {
       return topic;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/UploadedFileImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,12 +33,11 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
+import org.hibernate.Hibernate;
 import org.jboss.portlet.forums.model.UploadedFile;
-import org.hibernate.Hibernate;
 
+import java.io.Serializable;
 import java.sql.Blob;
-import java.sql.SQLException;
-import java.io.Serializable;
 
 /**
  * An uploaded file.
@@ -35,9 +57,9 @@
 
    /**
     * @param contentType the file content type
-    * @param content the file chunk of bytes
-   * @param name the file name
-   * @param size the size of the file
+    * @param content     the file chunk of bytes
+    * @param name        the file name
+    * @param size        the size of the file
     */
    public UploadedFileImpl(String contentType, byte[] content, String name, long size)
    {
@@ -84,9 +106,8 @@
    {
 
    }
-   /**
-    * @hibernate.property column="jbp_content_type"
-    */
+
+   /** @hibernate.property column="jbp_content_type" */
    public String getContentType()
    {
       return contentType;
@@ -97,12 +118,10 @@
       this.contentType = type;
    }
 
-   /**
-    * @hibernate.property column="jbp_size"
-    */
+   /** @hibernate.property column="jbp_size" */
    public long getSize()
    {
-        return size;
+      return size;
    }
 
    public void setSize(long size)
@@ -110,13 +129,10 @@
       this.size = size;
    }
 
-   /**
-    * @hibernate.property column="jbp_name"
-    * type="text"
-    */
+   /** @hibernate.property column="jbp_name" type="text" */
    public String getName()
    {
-        return name;
+      return name;
    }
 
    public void setName(String name)
@@ -134,11 +150,7 @@
       this.byteContent = byteContent;
    }
 
-   /**
-    * @hibernate.property column="jbp_content"
-    * type="blob"
-    * length="100000000"
-    */
+   /** @hibernate.property column="jbp_content" type="blob" length="100000000" */
    public Blob getContent()
    {
       return content;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/impl/WatchImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -8,8 +31,8 @@
  *****************************************/
 package org.jboss.portlet.forums.impl;
 
+import org.jboss.portlet.forums.model.Poster;
 import org.jboss.portlet.forums.model.Watch;
-import org.jboss.portlet.forums.model.Poster;
 
 import java.io.Serializable;
 
@@ -23,42 +46,28 @@
 public class WatchImpl implements Serializable, Watch
 {
 
-   /**
-    * .
-    */
+   /** . */
    private Integer id;
 
-   /**
-    * .
-    */
+   /** . */
    private int mode;
 
-   /**
-    * .
-    */
+   /** . */
    private Poster poster;
 
-   /**
-    * @hibernate.id column="jbp_id"
-    * generator-class="native"
-    */
+   /** @hibernate.id column="jbp_id" generator-class="native" */
    public Integer getId()
    {
       return id;
    }
 
-   /**
-    * Called by hibernate only.
-    */
+   /** Called by hibernate only. */
    private void setId(Integer id)
    {
       this.id = id;
    }
 
-   /**
-    * @hibernate.many-to-one column="jbp_poster_id"
-    * class="org.jboss.portlet.forums.impl.PosterImpl"
-    */
+   /** @hibernate.many-to-one column="jbp_poster_id" class="org.jboss.portlet.forums.impl.PosterImpl" */
    public Poster getPoster()
    {
       return poster;
@@ -69,11 +78,7 @@
       this.poster = poster;
    }
 
-   /**
-    * @hibernate.property column="jbp_mode"
-    * unique="false"
-    * update="true"
-    */
+   /** @hibernate.property column="jbp_mode" unique="false" update="true" */
    public int getMode()
    {
       return mode;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/interceptors/FloodControlInterceptor.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/interceptors/FloodControlInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/interceptors/FloodControlInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,20 +33,19 @@
  *****************************************/
 package org.jboss.portlet.forums.interceptors;
 
-import java.util.Date;
-
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portal.identity.User;
 import org.jboss.portlet.forums.command.Command;
 import org.jboss.portlet.forums.command.CommandException;
 import org.jboss.portlet.forums.command.filter.AbstractCommandFilter;
 import org.jboss.portlet.forums.command.result.Result;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.core.modules.ModuleException;
 import org.jboss.portlet.forums.commands.CommandConstants;
 import org.jboss.portlet.forums.commands.post.ForumCommand;
 
+import java.util.Date;
+
 /**
- * Interceptor for implementing flood control to stop evil users from flooding
- * the forums.
+ * Interceptor for implementing flood control to stop evil users from flooding the forums.
  *
  * @author <a href="kabirkhan at bigfoot.com">Kabir Khan </a>
  * @author <a href="theute at jboss.org">Thomas Heute </a>

Modified: trunk/forums/src/main/org/jboss/portlet/forums/interceptors/IndexInterceptor.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/interceptors/IndexInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/interceptors/IndexInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/interceptors/NotificationInterceptor.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/interceptors/NotificationInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/interceptors/NotificationInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -14,11 +37,6 @@
 import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
 import org.jboss.portal.api.node.PortalNode;
 import org.jboss.portal.api.node.PortalNodeURL;
-import org.jboss.portlet.forums.command.Command;
-import org.jboss.portlet.forums.command.CommandException;
-import org.jboss.portlet.forums.command.ActionCommand;
-import org.jboss.portlet.forums.command.filter.AbstractCommandFilter;
-import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portal.common.transaction.Transactions;
 import org.jboss.portal.core.modules.MailModule;
 import org.jboss.portal.core.modules.ModuleConstants;
@@ -30,6 +48,11 @@
 import org.jboss.portlet.forums.ForumsConstants;
 import org.jboss.portlet.forums.ForumsModule;
 import org.jboss.portlet.forums.ForumsPortlet;
+import org.jboss.portlet.forums.command.ActionCommand;
+import org.jboss.portlet.forums.command.Command;
+import org.jboss.portlet.forums.command.CommandException;
+import org.jboss.portlet.forums.command.filter.AbstractCommandFilter;
+import org.jboss.portlet.forums.command.result.Result;
 import org.jboss.portlet.forums.commands.CommandConstants;
 import org.jboss.portlet.forums.commands.post.NewTopicCommand;
 import org.jboss.portlet.forums.commands.post.ReplyCommand;

Modified: trunk/forums/src/main/org/jboss/portlet/forums/interceptors/ResourceCacheInvalidatorInterceptor.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/interceptors/ResourceCacheInvalidatorInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/interceptors/ResourceCacheInvalidatorInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Attachment.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Attachment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Attachment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -13,6 +36,7 @@
 
 /**
  * An Attachment.
+ *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
  * @version $Revision$
  */

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/AuthType.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/AuthType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/AuthType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -14,58 +37,36 @@
  */
 public class AuthType
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int VIEW = 0;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int READ = 1;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int POST = 2;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int REPLY = 3;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int EDIT = 4;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int DELETE = 5;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int ANNOUNCE = 6;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int STICKY = 7;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int POLL = 8;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int VOTE = 9;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public static final int ATTACH = 10;
 }

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Category.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Category.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Category.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Forum.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Forum.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Forum.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,9 +33,7 @@
  *****************************************/
 package org.jboss.portlet.forums.model;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -105,9 +126,7 @@
     */
    int getTopicCount();
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    void addTopicSize();
 
    /**
@@ -124,9 +143,7 @@
     */
    int getPostCount();
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    void addPostSize();
 
    /**
@@ -214,9 +231,7 @@
     */
    //void setType(int type);
 
-   /**
-    * @return DOCUMENT_ME
-    */
+   /** @return DOCUMENT_ME */
    List getWatches();
 
 }
\ No newline at end of file

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/ForumWatch.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/ForumWatch.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/ForumWatch.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Message.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Message.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Message.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Poll.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Poll.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Poll.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,7 +33,9 @@
  *****************************************/
 package org.jboss.portlet.forums.model;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -26,24 +51,16 @@
     */
    Integer getId();
 
-   /**
-    * @param string
-    */
+   /** @param string  */
    void setTitle(String string);
 
-   /**
-    * @param i
-    */
+   /** @param i  */
    void setLength(int i);
 
-   /**
-    * @param list
-    */
+   /** @param list  */
    void setOptions(List list);
 
-   /**
-    * @param set
-    */
+   /** @param set  */
    void setVoted(Set set);
 
    /**
@@ -51,29 +68,19 @@
     */
    /*void setIsEnded(boolean isEnded);*/
 
-   /**
-    * @param date
-    */
+   /** @param date  */
    void setCreationDate(Date date);
 
-   /**
-    * @return
-    */
+   /** @return  */
    List getOptions();
 
-   /**
-    * @return
-    */
+   /** @return  */
    Set getVoted();
 
-   /**
-    * @return
-    */
+   /** @return  */
    String getTitle();
 
-   /**
-    * @return
-    */
+   /** @return  */
    int getLength();
 
    /**
@@ -81,14 +88,10 @@
     */
    /*boolean getIsEnded();*/
 
-   /**
-    * @return
-    */
+   /** @return  */
    public int getVotesSum();
 
-   /**
-    * @return
-    */
+   /** @return  */
    public Date getCreationDate();
 
 

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/PollOption.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/PollOption.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/PollOption.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,38 +33,24 @@
  *****************************************/
 package org.jboss.portlet.forums.model;
 
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
  * @version $Revision$
  */
 public interface PollOption
 {
-   /**
-    * @param string
-    */
+   /** @param string  */
    void setQuestion(String string);
 
-   /**
-    * @param i
-    */
+   /** @param i  */
    void setVotes(int i);
 
-   /**
-    * @param
-    */
+   /** @param   */
    void incVotes();
 
-   /**
-    * @return
-    */
+   /** @return  */
    String getQuestion();
 
-   /**
-    * @return
-    */
+   /** @return  */
    int getVotes();
 }
\ No newline at end of file

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Post.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Post.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Post.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Poster.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Poster.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Poster.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -19,9 +42,7 @@
  */
 public interface Poster
 {
-   /**
-    * @return Returns the id of the user.
-    */
+   /** @return Returns the id of the user. */
    Integer getId();
 
    /**
@@ -46,8 +67,6 @@
     */
    int getPostCount();
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    void incrementPostCount();
 }
\ No newline at end of file

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Topic.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Topic.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Topic.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,7 +33,6 @@
  *****************************************/
 package org.jboss.portlet.forums.model;
 
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -231,9 +253,7 @@
     */
    void setSubject(String subject);
 
-   /**
-    * @return
-    */
+   /** @return  */
    List getWatches();
 
    /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/TopicWatch.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/TopicWatch.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/TopicWatch.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/UploadedFile.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/UploadedFile.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/UploadedFile.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -14,6 +37,7 @@
 
 /**
  * An uploaded file.
+ *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
  * @version $Revision$
  */

Modified: trunk/forums/src/main/org/jboss/portlet/forums/model/Watch.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/model/Watch.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/model/Watch.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -17,28 +40,18 @@
 public interface Watch
 {
 
-   /**
-    * Return the watch ID.
-    */
+   /** Return the watch ID. */
    Integer getId();
 
-   /**
-    * Return the poster.
-    */
+   /** Return the poster. */
    Poster getPoster();
 
-   /**
-    * Set the poster.
-    */
+   /** Set the poster. */
    void setPoster(Poster poster);
 
-   /**
-    * Return the mode.
-    */
+   /** Return the mode. */
    int getMode();
 
-   /**
-    * Set the mode.
-    */
+   /** Set the mode. */
    void setMode(int mode);
 }

Modified: trunk/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/properties/TCCLXProperties.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,6 +33,9 @@
  *****************************************/
 package org.jboss.portlet.forums.properties;
 
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portlet.forums.ForumsConstants;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
@@ -17,9 +43,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.jboss.portlet.forums.ForumsConstants;
-import org.jboss.portal.common.util.Tools;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/forums/src/main/org/jboss/portlet/forums/properties/XProperties.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/properties/XProperties.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/properties/XProperties.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/servlet/DownloadAttachmentsServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,31 +34,32 @@
 
 package org.jboss.portlet.forums.servlet;
 
+import org.jboss.portal.common.transaction.TransactionException;
+import org.jboss.portal.common.transaction.TransactionManagerProvider;
+import org.jboss.portal.common.transaction.Transactions;
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.ForumsConstants;
 import org.jboss.portlet.forums.ForumsModule;
-import org.jboss.portlet.forums.ForumsConstants;
+import org.jboss.portlet.forums.helper.AttachmentToken;
 import org.jboss.portlet.forums.helper.AttachmentTokenManager;
-import org.jboss.portlet.forums.helper.AttachmentToken;
 import org.jboss.portlet.forums.model.Attachment;
-import org.jboss.portal.core.modules.ModuleException;
-import org.jboss.portal.common.transaction.TransactionManagerProvider;
-import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.portal.common.transaction.TransactionException; 
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.transaction.TransactionManager;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
-import java.io.InputStream;
 import java.sql.SQLException;
 
 /**
  * Provides attachments downloading capabilities
+ *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
  * @version $Revision$
  */
@@ -68,7 +92,7 @@
                       HttpServletResponse response)
       throws ServletException, IOException
    {
-      doGet(request,response);
+      doGet(request, response);
    }
 
    public void doGet(HttpServletRequest request,
@@ -80,7 +104,7 @@
       Integer tid;
       if (tokenId == null)
       {
-         printMessage("Error - no token param",response);
+         printMessage("Error - no token param", response);
          return;
       }
       try
@@ -91,21 +115,21 @@
       catch (NumberFormatException e)
       {
          e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-         printMessage("invalid token",response);
+         printMessage("invalid token", response);
          return;
       }
       //obtain attachment token manager from session
       AttachmentTokenManager atm = (AttachmentTokenManager)request.getSession().getAttribute(ForumsConstants.ATTACHMENT_TOKENS_MANAGER);
-      if (atm==null)
+      if (atm == null)
       {
-         printMessage("Can't obtain token - maybe your session isn't valid",response);
+         printMessage("Can't obtain token - maybe your session isn't valid", response);
          return;
       }
 
       // clean up expired tokens
       atm.removeExpiredTokens();
       AttachmentToken at = null;
-      if (atm.hasToken(tid.intValue()) && (at = atm.getToken(tid.intValue()))!= null)
+      if (atm.hasToken(tid.intValue()) && (at = atm.getToken(tid.intValue())) != null)
       {
          Attachment attachment = getAttachment(at.getAttachmentId());
          if (attachment == null)
@@ -128,27 +152,34 @@
          catch (SQLException e)
          {
             e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-            printMessage("Error downloading data",response);
+            printMessage("Error downloading data", response);
             return;
          }
          // Transferring the bytes
-				try {
-					byte[] buffer = new byte[BUF_SIZE];
-					int read;
-					while ((read = in.read(buffer)) != -1)
-						os.write(buffer, 0, read);
-				} catch (Exception e2) {
-					// Nothing that we can really do. Just send an incomplete
-					// file.
-				} finally {
-					os.close();
-               in.close();
-				}
+         try
+         {
+            byte[] buffer = new byte[BUF_SIZE];
+            int read;
+            while ((read = in.read(buffer)) != -1)
+            {
+               os.write(buffer, 0, read);
+            }
+         }
+         catch (Exception e2)
+         {
+            // Nothing that we can really do. Just send an incomplete
+            // file.
+         }
+         finally
+         {
+            os.close();
+            in.close();
+         }
       }
       //if there is no valid token
       else
       {
-         printMessage("You are not autorised to access this resource - login or check if your session is still valid",response);
+         printMessage("You are not autorised to access this resource - login or check if your session is still valid", response);
          return;
       }
 
@@ -156,9 +187,9 @@
    }
 
    /**
-    * In portal we don't use hibernate transactions because every request
-    * is surounded with JTA transaction context by portal. So in servlet when we
-    * use ForumsModule we must do the same.
+    * In portal we don't use hibernate transactions because every request is surounded with JTA transaction context by
+    * portal. So in servlet when we use ForumsModule we must do the same.
+    *
     * @param id
     * @return
     */
@@ -214,6 +245,7 @@
 
    /**
     * this prints dummy message to output writer
+    *
     * @param msg
     * @param resp
     */

Modified: trunk/forums/src/main/org/jboss/portlet/forums/theme/FolderType.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/theme/FolderType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/theme/FolderType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -17,19 +40,13 @@
  */
 public class FolderType
 {
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public final String folder;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public final String folderNew;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public final String type;
 
    /**

Modified: trunk/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/forums/theme/ForumsTheme.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -58,279 +81,169 @@
       }
    }
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public FolderType FOLDER_ANNOUNCE;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public FolderType FOLDER_STICKY;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public FolderType FOLDER_LOCKED;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public FolderType FOLDER_NORMAL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public FolderType FOLDER_HOT;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceForumURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceForumNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceForumNewBigURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceForumLockedURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconLatestReplyURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconNewestReplyURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconGotopostURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderAnnounceURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderAnnounceNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderStickyURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderStickyNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderLockedURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderLockedNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderHotURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceFolderHotNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourcePostLockedURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourcePollVotingBar;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourcePollVotingLBar;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourcePollVotingRBar;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourcePostNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicModeDeleteURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicModMoveURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicModLockURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicModUnlockURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicModSplitURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicUnWatchURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceTopicWatchURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceReplyNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceReplyLockedURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconProfileURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconPMURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconEmailURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconWWWURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconICQURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconAIMURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconMSNMURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconSkypeURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconYIMURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconQuoteURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconSearchURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconEditURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconRepostURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconIPURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconDelpostURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconMinipostURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconMinipostNewURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceIconSpacerURL;
 
-   /**
-    * DOCUMENT_ME
-    */
+   /** DOCUMENT_ME */
    public String resourceHeadStylesheetURL;
    private XProperties xprops;
 

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -12,7 +35,6 @@
 package org.jboss.portlet.test.forums;
 
 import net.sourceforge.jwebunit.WebTestCase;
-import org.jboss.portlet.test.forums.TestConstants;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AdminEditTopicTypeTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,7 +34,6 @@
 package org.jboss.portlet.test.forums;
 
 import net.sourceforge.jwebunit.WebTestCase;
-import org.jboss.portlet.test.forums.TestConstants;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AdminFullTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AdminFullTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AdminFullTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,7 +34,6 @@
 package org.jboss.portlet.test.forums;
 
 import net.sourceforge.jwebunit.WebTestCase;
-import org.jboss.portlet.test.forums.TestConstants;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -256,7 +278,8 @@
    }*/
 
    /** First category cannot be renamed with admin interface */
-   public void testRename1stCat() {
+   public void testRename1stCat()
+   {
       String renamed = "yummy demo category";
       loginAdminUser();
       beginAt(PORTAL_FORUMS_MAIN_MAXIMIZED_URL);
@@ -271,14 +294,11 @@
    }
 
    /**
-    *
     * @param subject
-    * @param radioOption:
-    * 		"0" >Normal
-    * 		1"/>Sticky
-    * 		2"/>Announcement
+    * @param radioOption: "0" >Normal 1"/>Sticky 2"/>Announcement
     */
-   private void fillPost(String subject, String message, String radioOption) {
+   private void fillPost(String subject, String message, String radioOption)
+   {
       beginAt(PORTAL_FORUMS_MAIN_MAXIMIZED_URL);
       clickLinkWithText("Forum Index");
       clickLinkWithText("Second forum");
@@ -288,26 +308,25 @@
       setFormElement("message", message);
       setFormElement("topictype", radioOption);
    }
+
    /**
-    * After preview of a sticky post, the "post as" normal radio
-    * button is selected rather than the sticky one. Definitely a smaller bug...
-    * TODO probably same issue with annoucements
+    * After preview of a sticky post, the "post as" normal radio button is selected rather than the sticky one.
+    * Definitely a smaller bug... TODO probably same issue with annoucements
     */
-   public void testPreviewStickyPost() {
+   public void testPreviewStickyPost()
+   {
       loginAdminUser();
       String subj = "PreviewStickyPost";
-      String radioOp="1";
+      String radioOp = "1";
       fillPost(subj, "message", radioOp);
       submit("preview");
       assertTextPresent(subj);
       assertRadioOptionSelected("topictype", radioOp);
    }
 
-   /**
-    * @see testPreviewStickyPost
-    * if user wants to edit a post, exception is throwm after preview
-    */
-   public void testEditPreviewPost() {
+   /** @see testPreviewStickyPost if user wants to edit a post, exception is throwm after preview */
+   public void testEditPreviewPost()
+   {
       String subj = "EditPreviewStickyPost";
       loginAdminUser();
       fillPost(subj, "message", "0");

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPollPostEditTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPollPostEditTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPollPostEditTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,7 +34,6 @@
 package org.jboss.portlet.test.forums;
 
 import net.sourceforge.jwebunit.WebTestCase;
-import org.jboss.portlet.test.forums.TestConstants;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPostTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPostTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AdminPostTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -11,7 +34,6 @@
 package org.jboss.portlet.test.forums;
 
 import net.sourceforge.jwebunit.WebTestCase;
-import org.jboss.portlet.test.forums.TestConstants;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AdminTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AdminTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AdminTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,14 +33,13 @@
  *****************************************/
 package org.jboss.portlet.test.forums;
 
-import java.util.Random;
-
+import net.sourceforge.jwebunit.WebTestCase;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.operation.DatabaseOperation;
 import org.jboss.portal.test.core.Utils;
 
-import net.sourceforge.jwebunit.WebTestCase;
+import java.util.Random;
 
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -56,17 +78,19 @@
          connection.close();
       }
    }
-   
-   protected String getRandomTopicName () {
-       Random random = new Random ();
-       return "test topic"+Long.toString((long)(random.nextFloat()*10000000L));
+
+   protected String getRandomTopicName()
+   {
+      Random random = new Random();
+      return "test topic" + Long.toString((long)(random.nextFloat() * 10000000L));
    }
-   
-    protected String getRandomMessage () {
-        Random random = new Random ();
-        return "my message"+Long.toString((long)(random.nextFloat()*10000000000L));
-    }
 
+   protected String getRandomMessage()
+   {
+      Random random = new Random();
+      return "my message" + Long.toString((long)(random.nextFloat() * 10000000000L));
+   }
+
    public void loginUser()
    {
       beginAt("/index.html");
@@ -104,7 +128,7 @@
       clickLinkWithText("First forum");
       clickLink("newTopic");
       String randomTopicName = getRandomTopicName();
-      setFormElement("subject",randomTopicName);
+      setFormElement("subject", randomTopicName);
       String randomMessage = getRandomMessage();
       setFormElement("message", randomMessage);
       submit("post");
@@ -127,8 +151,8 @@
       clickLinkWithText("First forum");
       clickLinkWithText(randomTopicName);
       clickLink("postReply");
-      assertFormElementEquals("subject", "Re: "+randomTopicName);
-      String randomAnswerMessage = "my answer"+getRandomMessage();
+      assertFormElementEquals("subject", "Re: " + randomTopicName);
+      String randomAnswerMessage = "my answer" + getRandomMessage();
       setFormElement("message", randomAnswerMessage);
       // For flood control
       try
@@ -141,12 +165,12 @@
          e.printStackTrace();
       }
       submit("post");
-      assertTextPresent("Re: "+randomTopicName);
+      assertTextPresent("Re: " + randomTopicName);
       assertTextPresent(randomMessage);
       assertTextPresent(randomAnswerMessage);
    }
 
-    /* DOESN'T WORK!! */
+   /* DOESN'T WORK!! */
    /*public void testFlood()
    {
       loginUser();

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/AnonymousUserTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/AnonymousUserTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/AnonymousUserTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/CategoryModelTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/CategoryModelTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/CategoryModelTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,23 +33,23 @@
  *****************************************/
 package org.jboss.portlet.test.forums;
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.impl.CategoryImpl;
+import org.jboss.portlet.forums.impl.ForumImpl;
+import org.jboss.portlet.forums.impl.MessageImpl;
+import org.jboss.portlet.forums.impl.PostImpl;
 import org.jboss.portlet.forums.impl.TopicImpl;
-import org.jboss.portlet.forums.impl.PostImpl;
-import org.jboss.portlet.forums.impl.MessageImpl;
-import org.jboss.portlet.forums.impl.ForumImpl;
-import org.jboss.portlet.forums.impl.CategoryImpl;
+import org.jboss.portlet.forums.model.Category;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Message;
-import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.forums.model.Category;
-import org.jboss.portal.core.modules.ModuleException;
 
 import java.util.Date;
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.comboleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/ForumModelTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/ForumModelTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/ForumModelTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,22 +33,21 @@
  *****************************************/
 package org.jboss.portlet.test.forums;
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.impl.ForumImpl;
+import org.jboss.portlet.forums.impl.MessageImpl;
+import org.jboss.portlet.forums.impl.PostImpl;
 import org.jboss.portlet.forums.impl.TopicImpl;
-import org.jboss.portlet.forums.impl.PostImpl;
-import org.jboss.portlet.forums.impl.MessageImpl;
-import org.jboss.portlet.forums.impl.ForumImpl;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Message;
-import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portal.core.modules.ModuleException;
 
-
 import java.util.Date;
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.comboleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/ForumsModelTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/ForumsModelTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/ForumsModelTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -9,19 +32,17 @@
 package org.jboss.portlet.test.forums;
 
 
-import java.util.Properties;
-
 import junit.framework.TestCase;
-
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.Session;
 import org.hibernate.Transaction;
+import org.hibernate.cfg.Configuration;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.hibernate.cfg.Configuration;
-
 import org.jboss.portlet.forums.ForumsModule;
 import org.jboss.portlet.forums.impl.ForumsModuleImpl;
 
+import java.util.Properties;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet </a>
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/PostModelTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/PostModelTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/PostModelTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,24 +33,23 @@
  *****************************************/
 package org.jboss.portlet.test.forums;
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.impl.CategoryImpl;
+import org.jboss.portlet.forums.impl.ForumImpl;
+import org.jboss.portlet.forums.impl.MessageImpl;
+import org.jboss.portlet.forums.impl.PostImpl;
 import org.jboss.portlet.forums.impl.TopicImpl;
-import org.jboss.portlet.forums.impl.PostImpl;
-import org.jboss.portlet.forums.impl.MessageImpl;
-import org.jboss.portlet.forums.impl.ForumImpl;
-import org.jboss.portlet.forums.impl.CategoryImpl;
+import org.jboss.portlet.forums.model.Category;
+import org.jboss.portlet.forums.model.Forum;
+import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Message;
-import org.jboss.portlet.forums.model.Forum;
-import org.jboss.portlet.forums.model.Category;
-import org.jboss.portal.core.modules.ModuleException;
 
-
 import java.util.Date;
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.comboleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/TestConstants.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/TestConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/TestConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -30,15 +53,15 @@
    String PORTAL_LOGOUT_TEXT_LINK = "Logout";
 
    String PORTAL_FORUMS_TEXT_LINK = "forums";
-   
-   String PORTAL_FORUMS_MAIN_MAXIMIZED_URL = PORTAL_URL +"/index.html?ctrl:cmd=nav&ctrl:windowstate=maximized&ctrl:window=default.forums.ForumsPortletWindow";
-   
-   String PORTAL_FORUMS_MAIN_MINIMIZED_URL = PORTAL_URL +"/index.html?ctrl:cmd=nav&ctrl:windowstate=minimized&ctrl:window=default.forums.ForumsPortletWindow";
-   
-   String PORTAL_FORUMS_MAIN_EDIT_URL = PORTAL_URL +"/index.html?ctrl:cmd=nav&ctrl:mode=edit&ctrl:window=default.forums.ForumsPortletWindow";
-   
-   String PORTAL_FORUMS_MAIN_NORMAL_URL = PORTAL_URL +"/index.html?ctrl:cmd=nav&ctrl:windowstate=normal&ctrl:window=default.forums.ForumsPortletWindow";
 
+   String PORTAL_FORUMS_MAIN_MAXIMIZED_URL = PORTAL_URL + "/index.html?ctrl:cmd=nav&ctrl:windowstate=maximized&ctrl:window=default.forums.ForumsPortletWindow";
+
+   String PORTAL_FORUMS_MAIN_MINIMIZED_URL = PORTAL_URL + "/index.html?ctrl:cmd=nav&ctrl:windowstate=minimized&ctrl:window=default.forums.ForumsPortletWindow";
+
+   String PORTAL_FORUMS_MAIN_EDIT_URL = PORTAL_URL + "/index.html?ctrl:cmd=nav&ctrl:mode=edit&ctrl:window=default.forums.ForumsPortletWindow";
+
+   String PORTAL_FORUMS_MAIN_NORMAL_URL = PORTAL_URL + "/index.html?ctrl:cmd=nav&ctrl:windowstate=normal&ctrl:window=default.forums.ForumsPortletWindow";
+
    String PORTAL_LOGIN_USERNAME_FORM_ELEMENT = "j_username";
 
    String PORTAL_LOGIN_PASSWORD_FORM_ELEMENT = "j_password";

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/TopicModelTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/TopicModelTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/TopicModelTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,19 +33,19 @@
  *****************************************/
 package org.jboss.portlet.test.forums;
 
+import org.jboss.portal.core.modules.ModuleException;
+import org.jboss.portlet.forums.impl.MessageImpl;
+import org.jboss.portlet.forums.impl.PostImpl;
 import org.jboss.portlet.forums.impl.TopicImpl;
-import org.jboss.portlet.forums.impl.PostImpl;
-import org.jboss.portlet.forums.impl.MessageImpl;
+import org.jboss.portlet.forums.model.Message;
 import org.jboss.portlet.forums.model.Post;
 import org.jboss.portlet.forums.model.Topic;
-import org.jboss.portlet.forums.model.Message;
-import org.jboss.portal.core.modules.ModuleException;
 
 import java.util.Date;
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
-import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.comboleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/forums/src/main/org/jboss/portlet/test/forums/UserTestCase.java
===================================================================
--- trunk/forums/src/main/org/jboss/portlet/test/forums/UserTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/main/org/jboss/portlet/test/forums/UserTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*****************************************
  *                                       *
  *  JBoss Portal: The OpenSource Portal  *
@@ -10,14 +33,13 @@
  *****************************************/
 package org.jboss.portlet.test.forums;
 
-import java.util.Random;
-
+import net.sourceforge.jwebunit.WebTestCase;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.dataset.IDataSet;
 import org.dbunit.operation.DatabaseOperation;
 import org.jboss.portal.test.core.Utils;
 
-import net.sourceforge.jwebunit.WebTestCase;
+import java.util.Random;
 
 /**
  * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
@@ -53,16 +75,18 @@
       }
    }
 
-    protected String getRandomSubject () {
-        Random random = new Random ();
-        return "test topic"+Long.toString((long)(random.nextFloat()*10000000L));
-    }
-    
-     protected String getRandomMessage () {
-         Random random = new Random ();
-         return "my message"+Long.toString((long)(random.nextFloat()*10000000000L));
-     }
+   protected String getRandomSubject()
+   {
+      Random random = new Random();
+      return "test topic" + Long.toString((long)(random.nextFloat() * 10000000L));
+   }
 
+   protected String getRandomMessage()
+   {
+      Random random = new Random();
+      return "my message" + Long.toString((long)(random.nextFloat() * 10000000000L));
+   }
+
    public void loginUser()
    {
       beginAt("/index.html");
@@ -108,10 +132,7 @@
       assertTextPresent(newRandomMessage);
    }
 
-   /**
-    * Test page navigation
-    * This test suppose that there are 10 topics per page
-    */
+   /** Test page navigation This test suppose that there are 10 topics per page */
    public void testPost11Topics()
    {
       loginUser();
@@ -123,10 +144,10 @@
       setFormElement("subject", newRandomSubject);
       setFormElement("message", newRandomMessage);
       submit("post");
-      
+
       for (int i = 0; i < 10; i++)
       {
-         String newRandomSubjectT =  getRandomSubject();
+         String newRandomSubjectT = getRandomSubject();
          String newRandomMessageT = getRandomMessage();
          clickLink("newTopic");
          setFormElement("subject", newRandomSubjectT);
@@ -141,7 +162,7 @@
             e.printStackTrace();
          }*/
          submit("post");
-         
+
       }
       assertLinkPresentWithText("Next");
       clickLinkWithText("Next");
@@ -165,7 +186,7 @@
       clickLinkWithText(newRandomSubject);
       clickLink("postReply");
       newRandomMessage = getRandomMessage();
-      assertFormElementEquals("subject", "Re: "+newRandomSubject);
+      assertFormElementEquals("subject", "Re: " + newRandomSubject);
       setFormElement("message", newRandomMessage);
       // For flood control
       /*try
@@ -178,7 +199,7 @@
          e.printStackTrace();
       }*/
       submit("post");
-      assertTextPresent("Re: "+newRandomSubject);
+      assertTextPresent("Re: " + newRandomSubject);
       assertTextPresent(newRandomMessage);
    }
 

Modified: trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-ear/META-INF/application.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <application>
    <display-name>JBoss Portal Forums</display-name>
    <module>

Modified: trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-app>
    <module>
       <service>portal-forums.sar</service>

Modified: trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
    <mbean
       code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"

Modified: trunk/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-sar/conf/hibernate/hibernate.cfg.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='utf-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-configuration PUBLIC
    "-//Hibernate/Hibernate Configuration DTD//EN"
    "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-object.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-object.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-object.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployments>
    <deployment>
          <if-exists>overwrite</if-exists>

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-app.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-app>
    <app-name>forums</app-name>
 </jboss-app>

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <portlet>
       <portlet-name>ForumsPortlet</portlet-name>

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
 </jboss-web>

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/portal-lib.tld
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/portal-lib.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/portal-lib.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-  version="2.0">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
    <tlib-version>1.1</tlib-version>
    <short-name>JBoss-Portal-tags</short-name>
 

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app
-      xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-      version="1.0">
+   xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+   version="1.0">
    <portlet>
       <portlet-name>ForumsPortlet</portlet-name>
       <portlet-class>org.jboss.portlet.forums.ForumsPortlet</portlet-class>

Modified: trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml
===================================================================
--- trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/portal-forums-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/forums/src/resources/test/forums.xml
===================================================================
--- trunk/forums/src/resources/test/forums.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/forums/src/resources/test/forums.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!-- testing committ to check if it works -->
 <dataset>
    <jbp_forums_categories jbp_id="1" jbp_order="10" jbp_title="Dummy demo category"/>

Modified: trunk/identity/build.xml
===================================================================
--- trunk/identity/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,11 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
-  <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
-  <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-  <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
-  <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
-  <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
-  <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
+   <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
+   <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
+   <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
+   <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
    ]>
 
 <!-- $Id$ -->
@@ -31,15 +54,13 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;  
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
    &targets;
 
 
-
-
    <!-- ================================================================== -->
    <!-- Initialization                                                     -->
    <!-- ================================================================== -->
@@ -66,7 +87,7 @@
       <property name="junit.formatter.usefile" value="true"/>
 
       <!-- Configure thirdparty libraries -->
-       &libraries;
+      &libraries;
       <path id="library.classpath">
          <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.jbossxb.classpath"/>
@@ -135,28 +156,30 @@
    <!--| modules.                                                           |-->
    <!--+====================================================================+-->
 
-	<target name="output"
-	           description="Generate all target output."
-	           depends="compile">
+   <target name="output"
+           description="Generate all target output."
+           depends="compile">
 	      <mkdir dir="${build.lib}"/>
 	      <jar jarfile="${build.lib}/portal-identity-lib.jar">
 	         <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
 	      </jar>      
-	      <copy file="${build.resources}/hibernate/domain.hbm.xml" tofile="${build.resources}/hibernate/domain-single.hbm.xml">
+	      <copy file="${build.resources}/hibernate/domain.hbm.xml"
+               tofile="${build.resources}/hibernate/domain-single.hbm.xml">
 	         <filterset>
 	            <filtersfile file="../build/etc/single.properties"/>
 	         </filterset>
 	      </copy>
-	      <copy file="${build.resources}/hibernate/domain.hbm.xml" tofile="${build.resources}/hibernate/domain-clustered.hbm.xml">
+	      <copy file="${build.resources}/hibernate/domain.hbm.xml"
+               tofile="${build.resources}/hibernate/domain-clustered.hbm.xml">
 	         <filterset>
 	            <filtersfile file="../build/etc/clustered.properties"/>
 	         </filterset>
 	      </copy>
 	   </target>
-	   
-	   <!-- generates artifacts used for tests, requires output to be previously run
-	     -->
-	   <target name="package-tests" depends="init,
+
+   <!-- generates artifacts used for tests, requires output to be previously run
+         -->
+   <target name="package-tests" depends="init,
 	                                         output">
 	       <jar jarfile="${build.lib}/portal-identity-test-lib.jar">
 	           <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
@@ -200,7 +223,7 @@
 
       <execute-tests>
          <x-test>
-            <test todir="${test.reports}"  name="org.jboss.portal.test.identity.DBUserTestCase"/>
+            <test todir="${test.reports}" name="org.jboss.portal.test.identity.DBUserTestCase"/>
          </x-test>
          <x-classpath>
             <pathelement location="${build.lib}/portal-identity-lib.jar"/>

Modified: trunk/identity/src/main/org/jboss/portal/identity/IdentityException.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/IdentityException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/IdentityException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 /**

Modified: trunk/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 /**

Modified: trunk/identity/src/main/org/jboss/portal/identity/ProfileMap.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ProfileMap.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/ProfileMap.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 import java.util.Map;

Modified: trunk/identity/src/main/org/jboss/portal/identity/Role.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/Role.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/Role.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 import java.util.Set;
@@ -32,19 +33,13 @@
  */
 public interface Role
 {
-   /**
-    * The role identifier.
-    */
+   /** The role identifier. */
    Object getId();
 
-   /**
-    * The role name used in security rules. This name can not be modified
-    */
+   /** The role name used in security rules. This name can not be modified */
    String getName();
 
-   /**
-    * The role display name used on screens. This name can be modified
-    */
+   /** The role display name used on screens. This name can be modified */
    String getDisplayName();
 
    /**
@@ -52,8 +47,6 @@
     */
    void setDisplayName(String name);
 
-   /**
-    * The users.
-    */
+   /** The users. */
    Set getUsers();
 }

Modified: trunk/identity/src/main/org/jboss/portal/identity/RoleModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/RoleModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/RoleModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 import java.util.Set;
@@ -44,7 +45,7 @@
     *
     * @param names the role names
     * @return a collection of roles
-    * @throws  IllegalArgumentException
+    * @throws IllegalArgumentException
     */
    Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException;
 
@@ -106,7 +107,7 @@
    /**
     * Assign a set of role objects to a given user.
     *
-    * @param user the user
+    * @param user  the user
     * @param roles the user roles
     */
    void setRoles(User user, Set roles) throws IdentityException;

Modified: trunk/identity/src/main/org/jboss/portal/identity/User.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/User.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/User.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 import java.util.Date;
@@ -56,50 +57,34 @@
    String INFO_USER_VIEW_EMAIL_VIEW_REAL = "portal.user.email.view-real";
    String INFO_USER_LAST_LOGIN_DATE = "portal.user.last-login-date";
 
-   /**
-    * The user identifier.
-    */
+   /** The user identifier. */
    Object getId();
 
    // User management **************************************************************************************************
 
-   /**
-    * Disable the user.
-    */
+   /** Disable the user. */
    boolean getEnabled();
 
-   /**
-    * Enable the user.
-    */
+   /** Enable the user. */
    void setEnabled(boolean enable);
 
-   /**
-    * Set the password.
-    */
+   /** Set the password. */
    void updatePassword(String password);
 
-   /**
-    * Return true if the password is valid.
-    */
+   /** Return true if the password is valid. */
    boolean validatePassword(String password);
 
    // Detyped access to properties *************************************************************************************
 
-   /**
-    * Returns the user properties.
-    */
+   /** Returns the user properties. */
    ProfileMap getProfile();
 
    // Properties declared in this interface for convenient access ******************************************************
 
-   /**
-    * The user name.
-    */
+   /** The user name. */
    String getUserName();
 
-   /**
-    * The given name (firstname).
-    */
+   /** The given name (firstname). */
    String getGivenName();
 
    /**
@@ -107,9 +92,7 @@
     */
    void setGivenName(String givenName);
 
-   /**
-    * The family name.
-    */
+   /** The family name. */
    String getFamilyName();
 
    /**
@@ -152,43 +135,27 @@
     */
    void setViewRealEmail(boolean viewRealEmail);
 
-   /**
-    * Return the user preferred locale.
-    */
+   /** Return the user preferred locale. */
    Locale getPreferredLocale();
 
-   /**
-    * Set the user preferred locale.
-    */
+   /** Set the user preferred locale. */
    void setPreferredLocale(Locale locale);
 
-   /**
-    * Returns the signature.
-    */
+   /** Returns the signature. */
    String getSignature();
 
-   /**
-    * Set the signature.
-    */
+   /** Set the signature. */
    void setSignature(String signature);
 
-   /**
-    * Return the last time the user logged in or null if this date is not known.
-    */
+   /** Return the last time the user logged in or null if this date is not known. */
    Date getLastVisitDate();
 
-   /**
-    * Set the last visit date on this user.
-    */
+   /** Set the last visit date on this user. */
    void setLastVisitDate(Date date);
 
-   /**
-    * Return the theme set for this user as the app id of the Theme.
-    */
+   /** Return the theme set for this user as the app id of the Theme. */
    String getTheme();
 
-   /**
-    * Set the theme for this user.
-    */
+   /** Set the theme for this user. */
    void setTheme(String themeId);
 }

Modified: trunk/identity/src/main/org/jboss/portal/identity/UserModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/UserModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/UserModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity;
 
 import java.util.Set;
@@ -74,7 +75,7 @@
     * Get a range of users.
     *
     * @param offset the offset of the first result to retrieve
-    * @param limit the maximum number of users to retrieve
+    * @param limit  the maximum number of users to retrieve
     * @return the user set
     */
    Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException;
@@ -84,7 +85,7 @@
     *
     * @param filter a string filter applied to the user name.
     * @param offset the offset of the frist result to retrieve
-    * @param limit the maximum number of users to retrieve
+    * @param limit  the maximum number of users to retrieve
     * @return the user set
     */
    Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException;

Modified: trunk/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.auth;
 
-import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.common.transaction.Transactions;
+import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.portal.identity.Role;
 import org.jboss.portal.identity.RoleModule;
 import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.NoSuchUserException;
-import org.jboss.portal.common.transaction.Transactions;
-import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
+import org.jboss.portal.identity.UserModule;
 import org.jboss.security.SimpleGroup;
+import org.jboss.security.auth.spi.UsernamePasswordLoginModule;
 
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
 import javax.security.auth.callback.CallbackHandler;
-import javax.naming.NamingException;
-import javax.naming.InitialContext;
+import javax.security.auth.login.LoginException;
 import javax.transaction.TransactionManager;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.Iterator;
-import java.security.acl.Group;
-import java.security.Principal;
 
 /**
  * A login module that uses the user module.
@@ -49,7 +50,7 @@
  * @version $Revision$
  */
 public class IdentityLoginModule
-      extends UsernamePasswordLoginModule
+   extends UsernamePasswordLoginModule
 {
 
    protected String userModuleJNDIName;
@@ -219,9 +220,7 @@
       }
    }
 
-   /**
-    * Subclass to use the PortalPrincipal to make the username easier to retrieve by the portal.
-    */
+   /** Subclass to use the PortalPrincipal to make the username easier to retrieve by the portal. */
    protected Principal createIdentity(String username) throws Exception
    {
       return new UserPrincipal(username);

Modified: trunk/identity/src/main/org/jboss/portal/identity/auth/UserPrincipal.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/auth/UserPrincipal.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/auth/UserPrincipal.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.auth;
 
 import java.security.Principal;

Modified: trunk/identity/src/main/org/jboss/portal/identity/db/DBRoleModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/DBRoleModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/DBRoleModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.db;
 
 import org.apache.log4j.Logger;

Modified: trunk/identity/src/main/org/jboss/portal/identity/db/DBUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/DBUserModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/DBUserModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.db;
 
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.Set;
-import javax.naming.InitialContext;
 import org.apache.log4j.Logger;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
@@ -38,6 +35,11 @@
 import org.jboss.portal.identity.UserModule;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
+import javax.naming.InitialContext;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.Set;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet </a>
  * @version $Revision$
@@ -48,29 +50,19 @@
    implements UserModule
 {
 
-   /**
-    * .
-    */
+   /** . */
    private final Logger log = Logger.getLogger(getClass());
 
-   /**
-    * .
-    */
+   /** . */
    protected SessionFactory sessionFactory;
 
-   /**
-    * .
-    */
+   /** . */
    protected String sessionFactoryJNDIName;
 
-   /**
-    * .
-    */
+   /** . */
    protected String jndiName;
 
-   /**
-    * .
-    */
+   /** . */
    protected JNDI.Binding jndiBinding;
 
    public DBUserModuleImpl()
@@ -129,7 +121,7 @@
 
    public User findUserByUserName(String userName) throws IdentityException
    {
-      if(userName != null)
+      if (userName != null)
       {
          try
          {
@@ -137,14 +129,14 @@
             Query query = session.createQuery("from UserImpl where userName=:userName");
             query.setParameter("userName", userName);
             query.setCacheable(true);
-            UserImpl user = (UserImpl) query.uniqueResult();
-            if(user == null)
+            UserImpl user = (UserImpl)query.uniqueResult();
+            if (user == null)
             {
                throw new NoSuchUserException("No such user " + userName);
             }
             return user;
          }
-         catch(HibernateException e)
+         catch (HibernateException e)
          {
             String message = "Cannot find user by name " + userName;
             log.error(message, e);
@@ -159,7 +151,7 @@
 
    public User findUserById(String id) throws IllegalArgumentException, IdentityException, NoSuchUserException
    {
-      if(id == null)
+      if (id == null)
       {
          throw new IllegalArgumentException("The id is null");
       }
@@ -167,7 +159,7 @@
       {
          return findUserById(new Long(id));
       }
-      catch(NumberFormatException e)
+      catch (NumberFormatException e)
       {
          throw new IllegalArgumentException("Cannot parse id into an long " + id);
       }
@@ -175,19 +167,19 @@
 
    public User findUserById(Object id) throws IllegalArgumentException, IdentityException, NoSuchUserException
    {
-      if(id instanceof Long)
+      if (id instanceof Long)
       {
          try
          {
             Session session = getCurrentSession();
-            UserImpl user = (UserImpl) session.get(UserImpl.class, (Long) id);
-            if(user == null)
+            UserImpl user = (UserImpl)session.get(UserImpl.class, (Long)id);
+            if (user == null)
             {
                throw new NoSuchUserException("No user found for " + id);
             }
             return user;
          }
-         catch(HibernateException e)
+         catch (HibernateException e)
          {
             String message = "Cannot find user by id " + id;
             log.error(message, e);
@@ -202,7 +194,7 @@
 
    public User createUser(String userName, String password, String realEmail) throws IdentityException
    {
-      if(userName != null)
+      if (userName != null)
       {
          try
          {
@@ -213,7 +205,7 @@
             session.save(user);
             return user;
          }
-         catch(HibernateException e)
+         catch (HibernateException e)
          {
             String message = "Cannot create user " + userName;
             log.error(message, e);
@@ -228,20 +220,20 @@
 
    public void removeUser(Object id) throws IdentityException
    {
-      if(id instanceof Long)
+      if (id instanceof Long)
       {
          try
          {
             Session session = getCurrentSession();
-            UserImpl user = (UserImpl) session.load(UserImpl.class, (Serializable) id);
-            if(user == null)
+            UserImpl user = (UserImpl)session.load(UserImpl.class, (Serializable)id);
+            if (user == null)
             {
                throw new NoSuchUserException("No such user " + id);
             }
             session.delete(user);
             session.flush();
          }
-         catch(HibernateException e)
+         catch (HibernateException e)
          {
             String message = "Cannot remove user " + id;
             log.error(message, e);
@@ -265,7 +257,7 @@
          Iterator iterator = query.iterate();
          return Tools.toSet(iterator);
       }
-      catch(HibernateException e)
+      catch (HibernateException e)
       {
          String message = "Cannot find user range [" + offset + "," + limit + "]";
          log.error(message, e);
@@ -289,7 +281,7 @@
          Iterator iterator = query.iterate();
          return Tools.toSet(iterator);
       }
-      catch(HibernateException e)
+      catch (HibernateException e)
       {
          String message = "Cannot find user range [" + offset + "," + limit + "]";
          log.error(message, e);
@@ -303,9 +295,9 @@
       {
          Session session = getCurrentSession();
          Query query = session.createQuery("select count(u.key) from UserImpl as u");
-         return ((Number) query.uniqueResult()).intValue();
+         return ((Number)query.uniqueResult()).intValue();
       }
-      catch(HibernateException e)
+      catch (HibernateException e)
       {
          String message = "Cannot count users";
          log.error(message, e);

Modified: trunk/identity/src/main/org/jboss/portal/identity/db/ProfileMapImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/ProfileMapImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/ProfileMapImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.db;
 
 import org.jboss.portal.identity.ProfileMap;
 
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collection;
 import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * A mutable map that expose user properties.
@@ -77,9 +78,7 @@
       return false;
    }
 
-   /**
-    * @throws ClassCastException if the key is not an instance of string
-    */
+   /** @throws ClassCastException if the key is not an instance of string */
    public boolean containsKey(Object key) throws ClassCastException
    {
       if (key == null)
@@ -98,9 +97,7 @@
       return user.getDynamic().containsKey(key);
    }
 
-   /**
-    * @throws ClassCastException if the value is not an instance of string
-    */
+   /** @throws ClassCastException if the value is not an instance of string */
    public boolean containsValue(Object value) throws ClassCastException
    {
       if (value == null)
@@ -111,7 +108,7 @@
       {
          throw new ClassCastException("Value must be a string");
       }
-      for (Iterator i = UserImpl.ACCESSORS.values().iterator();i.hasNext();)
+      for (Iterator i = UserImpl.ACCESSORS.values().iterator(); i.hasNext();)
       {
          UserImpl.PropertyAccessor accessor = (UserImpl.PropertyAccessor)i.next();
          Object value2 = accessor.get(user);
@@ -123,9 +120,7 @@
       return user.getDynamic().containsValue(value);
    }
 
-   /**
-    * @throws ClassCastException if the key is not an instance of string
-    */
+   /** @throws ClassCastException if the key is not an instance of string */
    public Object get(Object key)
    {
       if (key == null)
@@ -146,11 +141,11 @@
 
    /**
     * Put a value in the dynamic map.
+    * <p/>
+    * If the key is not an instance of string then an IllegalArgumentException is thrown. If the value is mapped to an
+    * accessor of a non writable field then an IllegalArgumentException is thrown. If the value is mapped to an accessor
+    * of a non nullable field and the field is null then an IllegalArgumentException is thrown.
     *
-    * If the key is not an instance of string then an IllegalArgumentException is thrown.
-    * If the value is mapped to an accessor of a non writable field then an IllegalArgumentException is thrown.
-    * If the value is mapped to an accessor of a non nullable field and the field is null then an IllegalArgumentException is thrown.
-    *
     * @throws IllegalArgumentException
     */
    public Object put(Object key, Object newValue) throws IllegalArgumentException
@@ -207,9 +202,7 @@
       return user.getDynamic().remove(key);
    }
 
-   /**
-    * Clear only dynamic properties.
-    */
+   /** Clear only dynamic properties. */
    public void clear()
    {
       user.getDynamic().clear();
@@ -229,7 +222,7 @@
    public Collection values()
    {
       ArrayList collection = new ArrayList(size());
-      for (Iterator i = UserImpl.ACCESSORS.values().iterator();i.hasNext();)
+      for (Iterator i = UserImpl.ACCESSORS.values().iterator(); i.hasNext();)
       {
          UserImpl.PropertyAccessor accessor = (UserImpl.PropertyAccessor)i.next();
          collection.add(accessor.get(user));
@@ -238,13 +231,11 @@
       return collection;
    }
 
-   /**
-    * Returns an immutable collection of entries.
-    */
+   /** Returns an immutable collection of entries. */
    public Set entrySet()
    {
       Map copy = new HashMap(user.getDynamic());
-      for (Iterator i = UserImpl.ACCESSORS.values().iterator();i.hasNext();)
+      for (Iterator i = UserImpl.ACCESSORS.values().iterator(); i.hasNext();)
       {
          UserImpl.PropertyAccessor accessor = (UserImpl.PropertyAccessor)i.next();
          copy.put(accessor.getPropertyName(), accessor.get(user));
@@ -255,7 +246,7 @@
    public void putAll(Map map)
    {
       // todo : check all properties ok with changes before proceeding
-      for (Iterator i = map.entrySet().iterator();i.hasNext();)
+      for (Iterator i = map.entrySet().iterator(); i.hasNext();)
       {
          Map.Entry entry = (Map.Entry)i.next();
          Object key = entry.getKey();

Modified: trunk/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/RoleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.db;
 
 import org.jboss.portal.identity.Role;
 
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet </a>
@@ -33,7 +34,7 @@
  * @version $Revision$
  */
 public class RoleImpl
-      implements Role
+   implements Role
 {
 
    private Long key;
@@ -75,10 +76,8 @@
    }
 
    /**
-    * @hibernate.id
-    *    column="jbp_rid"
-    *    generator-class="native"
-    *
+    * @hibernate.id column="jbp_rid" generator-class="native"
+    * <p/>
     * Called by hibernate.
     */
    protected Long getKey()
@@ -86,25 +85,19 @@
       return key;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    protected void setKey(Long key)
    {
       this.key = key;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    protected void setName(String name)
    {
       this.name = name;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    protected void setUsers(Set users)
    {
       this.users = users;

Modified: trunk/identity/src/main/org/jboss/portal/identity/db/UserImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/db/UserImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity/db/UserImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity.db;
 
 import org.apache.log4j.Logger;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.ProfileMap;
-import org.jboss.portal.identity.Role;
 import org.jboss.portal.common.p3p.P3PConstants;
 import org.jboss.portal.common.util.LocaleInfo;
 import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.identity.ProfileMap;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.User;
 
-import java.util.Map;
-import java.util.HashMap;
+import java.lang.reflect.Field;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Set;
+import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Locale;
 import java.util.Iterator;
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.text.DateFormat;
-import java.text.ParseException;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * User interface implementation.
@@ -144,41 +145,31 @@
       this.enabled = false;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    public Long getKey()
    {
       return key;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    protected void setKey(Long key)
    {
       this.key = key;
    }
 
-   /**
-    * Called by hibernate.
-    */
+   /** Called by hibernate. */
    protected void setUserName(String userName)
    {
       this.userName = userName;
    }
 
-   /**
-    * Called by Hibernate.
-    */
+   /** Called by Hibernate. */
    protected Map getDynamic()
    {
       return dynamic;
    }
 
-   /**
-    * Called by Hibernate.
-    */
+   /** Called by Hibernate. */
    protected void setDynamic(Map dynamic)
    {
       this.dynamic = dynamic;
@@ -331,17 +322,13 @@
       this.password = password;
    }
 
-   /**
-    * Returns the roles related to this user.
-    */
+   /** Returns the roles related to this user. */
    public Set getRoles()
    {
       return roles;
    }
 
-   /**
-    * Update the roles.
-    */
+   /** Update the roles. */
    public void setRoles(Set roles)
    {
       this.roles = roles;
@@ -350,9 +337,7 @@
 
    // Dynamic attributes
 
-   /**
-    * Implemented as a dynamic attribute (see #INFO_USER_LAST_LOGIN_DATE).
-    */
+   /** Implemented as a dynamic attribute (see #INFO_USER_LAST_LOGIN_DATE). */
    public Date getLastVisitDate()
    {
       Date date = null;
@@ -387,9 +372,7 @@
       }
    }
 
-   /**
-    * Implemented as a dynamic attribute (see #INFO_USER_SIGNATURE).
-    */
+   /** Implemented as a dynamic attribute (see #INFO_USER_SIGNATURE). */
    public String getSignature()
    {
       return (String)getDynamic().get(User.INFO_USER_SIGNATURE);
@@ -400,9 +383,7 @@
       getDynamic().put(User.INFO_USER_SIGNATURE, signature);
    }
 
-   /**
-    * Implemented as a dynamic attribute (see #INFO_USER_LOCALE).
-    */
+   /** Implemented as a dynamic attribute (see #INFO_USER_LOCALE). */
    public Locale getPreferredLocale()
    {
       Locale locale = null;
@@ -458,9 +439,7 @@
       return false;
    }
 
-   /**
-    * Return all the role names of the user.
-    */
+   /** Return all the role names of the user. */
    public Set getRoleNames()
    {
       if (roleNames == null)
@@ -483,9 +462,7 @@
       return "User[" + key + "," + userName + "]";
    }
 
-   /**
-    * An accessor that maps a user field to a property name.
-    */
+   /** An accessor that maps a user field to a property name. */
    static abstract class PropertyAccessor
    {
 
@@ -526,7 +503,7 @@
 
       /**
        * @param instance the user instance
-       * @param string the value
+       * @param string   the value
        * @throws IllegalArgumentException if the string cannot be converted to an object
        */
       public void set(Object instance, String string) throws IllegalArgumentException
@@ -604,10 +581,12 @@
       {
          super(propertyName, fieldName, writable, nullable);
       }
+
       protected Object toObject(String value)
       {
          return value;
       }
+
       protected String toString(Object value)
       {
          return (String)value;
@@ -620,6 +599,7 @@
       {
          super(propertyName, fieldName, writable, nullable);
       }
+
       protected Object toObject(String value) throws IllegalArgumentException
       {
          if ("true".equalsIgnoreCase(value))
@@ -635,6 +615,7 @@
             throw new IllegalArgumentException("The value " + value + " cannot be converted to boolean for accessor " + toString());
          }
       }
+
       protected String toString(Object value)
       {
          return value.toString();
@@ -650,10 +631,12 @@
             return new SimpleDateFormat();
          }
       };
+
       public DatePropertyAccessor(String propertyName, String fieldName, boolean writable, boolean nullable)
       {
          super(propertyName, fieldName, writable, nullable);
       }
+
       protected Object toObject(String value) throws IllegalArgumentException
       {
          try
@@ -667,6 +650,7 @@
             throw new IllegalArgumentException();
          }
       }
+
       protected String toString(Object value)
       {
          Date date = (Date)value;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/LDAPMembershipStrategy.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/LDAPMembershipStrategy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/LDAPMembershipStrategy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
 import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity2.ldap.LDAPRoleImpl;
 import org.jboss.portal.identity2.ldap.LDAPUserImpl;
-import org.jboss.portal.identity2.ldap.LDAPRoleImpl;
 
 import java.util.Set;
 
@@ -33,7 +34,7 @@
  */
 public interface LDAPMembershipStrategy
 {
-   
+
    public Set getRoles(LDAPUserImpl user) throws IdentityException;
 
    public Set getUsers(LDAPRoleImpl role) throws IdentityException;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/MembershipModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/MembershipModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/MembershipModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
 
+import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.IdentityException;
 
 import java.util.Set;
 

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ProfileMap.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ProfileMap.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ProfileMap.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
 import java.util.Map;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/Role.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/Role.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/Role.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
-import java.util.Set;
-
 /**
  * A role of users.
  *
@@ -32,19 +31,13 @@
  */
 public interface Role
 {
-   /**
-    * The role identifier.
-    */
+   /** The role identifier. */
    Object getId();
 
-   /**
-    * The role name used in security rules. This name can not be modified
-    */
+   /** The role name used in security rules. This name can not be modified */
    String getName();
 
-   /**
-    * The role display name used on screens. This name can be modified
-    */
+   /** The role display name used on screens. This name can be modified */
    String getDisplayName();
 
    /**

Modified: trunk/identity/src/main/org/jboss/portal/identity2/RoleModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/RoleModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/RoleModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
+import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.IdentityException;
 
 import java.util.Set;
 
@@ -47,7 +48,7 @@
     *
     * @param names the role names
     * @return a collection of roles
-    * @throws  IllegalArgumentException
+    * @throws IllegalArgumentException
     */
    Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException;
 
@@ -97,5 +98,5 @@
     */
    Set findRoles() throws IdentityException;
 
-   
+
 }

Modified: trunk/identity/src/main/org/jboss/portal/identity2/User.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/User.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/User.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
 import org.jboss.portal.identity.ProfileMap;
@@ -58,50 +59,34 @@
    String INFO_USER_VIEW_EMAIL_VIEW_REAL = "portal.user.email.view-real";
    String INFO_USER_LAST_LOGIN_DATE = "portal.user.last-login-date";
 
-   /**
-    * The user identifier.
-    */
+   /** The user identifier. */
    Object getId();
 
    // User management **************************************************************************************************
 
-   /**
-    * Disable the user.
-    */
+   /** Disable the user. */
    boolean getEnabled();
 
-   /**
-    * Enable the user.
-    */
+   /** Enable the user. */
    void setEnabled(boolean enable);
 
-   /**
-    * Set the password.
-    */
+   /** Set the password. */
    void updatePassword(String password);
 
-   /**
-    * Return true if the password is valid.
-    */
+   /** Return true if the password is valid. */
    boolean validatePassword(String password);
 
    // Detyped access to properties *************************************************************************************
 
-   /**
-    * Returns the user properties.
-    */
+   /** Returns the user properties. */
    ProfileMap getProfile();
 
    // Properties declared in this interface for convenient access ******************************************************
 
-   /**
-    * The user name.
-    */
+   /** The user name. */
    String getUserName();
 
-   /**
-    * The given name (firstname).
-    */
+   /** The given name (firstname). */
    String getGivenName();
 
    /**
@@ -109,9 +94,7 @@
     */
    void setGivenName(String givenName);
 
-   /**
-    * The family name.
-    */
+   /** The family name. */
    String getFamilyName();
 
    /**
@@ -154,43 +137,27 @@
     */
    void setViewRealEmail(boolean viewRealEmail);
 
-   /**
-    * Return the user preferred locale.
-    */
+   /** Return the user preferred locale. */
    Locale getPreferredLocale();
 
-   /**
-    * Set the user preferred locale.
-    */
+   /** Set the user preferred locale. */
    void setPreferredLocale(Locale locale);
 
-   /**
-    * Returns the signature.
-    */
+   /** Returns the signature. */
    String getSignature();
 
-   /**
-    * Set the signature.
-    */
+   /** Set the signature. */
    void setSignature(String signature);
 
-   /**
-    * Return the last time the user logged in or null if this date is not known.
-    */
+   /** Return the last time the user logged in or null if this date is not known. */
    Date getLastVisitDate();
 
-   /**
-    * Set the last visit date on this user.
-    */
+   /** Set the last visit date on this user. */
    void setLastVisitDate(Date date);
 
-   /**
-    * Return the theme set for this user as the app id of the Theme.
-    */
+   /** Return the theme set for this user as the app id of the Theme. */
    String getTheme();
 
-   /**
-    * Set the theme for this user.
-    */
+   /** Set the theme for this user. */
    void setTheme(String themeId);
 }

Modified: trunk/identity/src/main/org/jboss/portal/identity2/UserModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/UserModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/UserModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
-import org.jboss.portal.identity.User;
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.portal.identity.User;
 
 import java.util.Set;
 
@@ -78,7 +79,7 @@
     * Get a range of users.
     *
     * @param offset the offset of the first result to retrieve
-    * @param limit the maximum number of users to retrieve
+    * @param limit  the maximum number of users to retrieve
     * @return the user set
     */
    Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException;
@@ -88,7 +89,7 @@
     *
     * @param filter a string filter applied to the user name.
     * @param offset the offset of the frist result to retrieve
-    * @param limit the maximum number of users to retrieve
+    * @param limit  the maximum number of users to retrieve
     * @return the user set
     */
    Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/UserProfileModule.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/UserProfileModule.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/UserProfileModule.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2;
 
 import java.util.Set;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/db/HibernateUserProfileModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.db;
 
+import org.jboss.portal.identity.db.UserImpl;
+import org.jboss.portal.identity2.User;
 import org.jboss.portal.identity2.UserProfileModule;
-import org.jboss.portal.identity2.User;
-import org.jboss.portal.identity.db.UserImpl;
 
 import java.util.Set;
 

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPConnectionContext.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPConnectionContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPConnectionContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,32 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
-import javax.naming.InitialContext;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.ldap.InitialLdapContext;
-import javax.naming.directory.InitialDirContext;
 import java.util.Hashtable;
 
 /**
@@ -92,7 +91,6 @@
    }
 
 
-
    public String toString()
    {
       StringBuffer str = new StringBuffer();
@@ -105,8 +103,6 @@
       return str.toString();
    }
 
-   
-
    //************************************
    //******* Getters and Setters ********
    //************************************
@@ -181,6 +177,5 @@
       this.authentication = authentication;
    }
 
-   
 
 }

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtRoleModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtRoleModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtRoleModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
-import org.jboss.portal.identity2.RoleModule;
+import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import java.util.Set;
@@ -34,7 +34,7 @@
  */
 public class LDAPExtRoleModuleImpl extends LDAPRoleModuleImpl
 {
-   
+
    public Role findRoleByName(String name) throws IdentityException, IllegalArgumentException
    {
       throw new UnsupportedOperationException("Not yet implemented");

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtUserModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPExtUserModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
-import org.jboss.portal.identity2.UserModule;
-import org.jboss.portal.identity.User;
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.NoSuchUserException;
+import org.jboss.portal.identity.User;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import java.util.Set;
@@ -33,9 +33,9 @@
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision: 1.1 $
  */
-public class LDAPExtUserModuleImpl extends LDAPUserModuleImpl 
+public class LDAPExtUserModuleImpl extends LDAPUserModuleImpl
 {
-   
+
    public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException
    {
       throw new UnsupportedOperationException("Not yet implemented");

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPMembershipModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPMembershipModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPMembershipModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity2.LDAPMembershipStrategy;
 import org.jboss.portal.identity2.MembershipModule;
 import org.jboss.portal.identity2.Role;
-import org.jboss.portal.identity2.LDAPMembershipStrategy;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import java.util.Set;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPOperation.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPOperation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPOperation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
 /**

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
 import org.jboss.portal.identity.Role;
@@ -85,6 +86,6 @@
 
    public Object getId()
    {
-      return id;  
+      return id;
    }
 }

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPRoleModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
-import org.jboss.portal.identity2.RoleModule;
-import org.jboss.portal.identity.Role;
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity2.RoleModule;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.common.util.Tools;
 
-import javax.naming.directory.SearchResult;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
-import java.util.Set;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -119,7 +120,6 @@
    }
 
 
-
    public Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException
    {
 
@@ -134,7 +134,6 @@
          //
          LdapContext ctx = (LdapContext)getConnectionContext().createInitialContext().lookup(getContainerDN());
 
-
          //We store new entry using set of attributes. This should give more flexibility then
          //extending user object from ContextDir - configure what objectClass place there
          Attributes attrs = new BasicAttributes(true);
@@ -145,21 +144,21 @@
          oc.add("groupOfNames");
          attrs.put(oc);
          //set the value for cn in case rid attribute is different
-         attrs.put("cn","");
-         attrs.put("member","");
+         attrs.put("cn", "");
+         attrs.put("member", "");
 
          //role name
-         attrs.put(getRidAttributeID(),name);
+         attrs.put(getRidAttributeID(), name);
 
          //display name
          attrs.put(getDisplayNameAttributeID(), displayName);
 
          String dn = getRidAttributeID().concat("=").concat(name);
 
-         log.debug("creating ldap entry for: " + dn + "; " + attrs );
+         log.debug("creating ldap entry for: " + dn + "; " + attrs);
          ctx.createSubcontext(dn, attrs);
       }
-      catch(NamingException e)
+      catch (NamingException e)
       {
          throw new IdentityException("Failed to create user", e);
       }
@@ -187,7 +186,7 @@
          log.debug("removing entry: " + ldapr.getDn());
          ctx.unbind(ldapr.getDn());
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          throw new IdentityException("Failed to remove role: ", e);
       }
@@ -231,22 +230,22 @@
    protected LDAPRoleImpl createRoleInstance(SearchResult sr) throws IdentityException
    {
       LDAPRoleImpl ldapr = null;
-      try {
+      try
+      {
 
 
-         log.debug("SearchResult: " + sr );
+         log.debug("SearchResult: " + sr);
 
          Attributes attrs = sr.getAttributes();
          log.debug("Search result attributes: " + attrs);
 
-
          //role name
          Attribute uida = attrs.get(getRidAttributeID());
          if (uida == null)
          {
             throw new IdentityException("LDAP entry doesn't contain proper attribute:" + getRidAttributeID());
          }
-         ldapr =  new LDAPRoleImpl(uida.getID().concat("=").concat((String)uida.get()) + "," + getContainerDN());
+         ldapr = new LDAPRoleImpl(uida.getID().concat("=").concat((String)uida.get()) + "," + getContainerDN());
          ldapr.setId((String)uida.get());
 
          Attribute display = attrs.get(getDisplayNameAttributeID());
@@ -261,8 +260,6 @@
          log.debug("role dn: " + ldapr.getDn());
 
 
-
-
       }
       catch (NamingException e)
       {
@@ -272,7 +269,6 @@
       return ldapr;
    }
 
-
    //**************************
    //*** Getter and Setters
    //**************************
@@ -301,7 +297,7 @@
       this.connectionContext = connectionContext;
    }
 
-    public String getContainerDN()
+   public String getContainerDN()
    {
       return containerDN;
    }

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSession.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSession.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSession.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
 /**
@@ -27,7 +28,7 @@
  */
 public interface LDAPSession
 {
-   
+
    public void reset();
 
    public void begin();

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSessionService.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSessionService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPSessionService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
 /**

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
+import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity.ProfileMap;
 import org.jboss.portal.identity.User;
 import org.jboss.portal.identity2.UserProfileModule;
-import org.jboss.portal.identity.ProfileMap;
-import org.jboss.portal.identity.IdentityException;
 
 import java.util.Date;
 import java.util.Locale;
@@ -63,128 +64,125 @@
 
    public boolean getEnabled()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setEnabled(boolean enable)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void updatePassword(String password)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public boolean validatePassword(String password)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public ProfileMap getProfile()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
 
-
    public String getGivenName()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setGivenName(String givenName)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public String getFamilyName()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setFamilyName(String familyName)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public String getRealEmail()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setRealEmail(String realEmail)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public String getFakeEmail()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setFakeEmail(String fakeEmail)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public Date getRegistrationDate()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public boolean getViewRealEmail()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setViewRealEmail(boolean viewRealEmail)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public Locale getPreferredLocale()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setPreferredLocale(Locale locale)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public String getSignature()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setSignature(String signature)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public Date getLastVisitDate()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setLastVisitDate(Date date)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public String getTheme()
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
    public void setTheme(String themeId)
    {
-       throw new UnsupportedOperationException("Not yet implemented");
+      throw new UnsupportedOperationException("Not yet implemented");
    }
 
-
-
    //**************************
    //*** Getter and Setters
    //**************************
@@ -216,7 +214,6 @@
    }
 
 
-
    public String getUserName()
    {
       return this.id;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,54 +1,52 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
-import org.jboss.portal.identity2.UserModule;
-import org.jboss.portal.identity2.UserProfileModule;
-import org.jboss.portal.identity.User;
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.identity.IdentityException;
 import org.jboss.portal.identity.NoSuchUserException;
-import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity2.UserModule;
+import org.jboss.portal.identity2.UserProfileModule;
 
-import javax.naming.directory.SearchResult;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.SearchControls;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
-import javax.naming.NamingException;
-import javax.naming.NamingEnumeration;
-import javax.naming.Binding;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
-import java.util.Set;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Set;
 
 /**
- * Simple implementation of UserModule for LDAP support. Search of users is limited to one place
- ** containerField -  DN of entry containing users (like ou=People,dc=example,dc=com).
- * It's where users will be added using createUser() method. Under this DN users
- * will be searched using ONELEVEL_SCOPE
- ** uidAttributeID - attribute that stores user id. Default value is "uid"
+ * Simple implementation of UserModule for LDAP support. Search of users is limited to one place * containerField -  DN
+ * of entry containing users (like ou=People,dc=example,dc=com). It's where users will be added using createUser()
+ * method. Under this DN users will be searched using ONELEVEL_SCOPE * uidAttributeID - attribute that stores user id.
+ * Default value is "uid"
  *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision: 1.1 $
@@ -61,15 +59,12 @@
 
    private UserProfileModule userProfileModule;
 
-   /**
-    * Attribute that stores user id
-    */
+   /** Attribute that stores user id */
    private String uidAttributeID;
 
    /**
-    * DN of entry containing users (like ou=People,dc=example,dc=com).
-    * It's where users will be added using createUser() method. Under this DN users
-    * will be searched using ONELEVEL_SCOPE
+    * DN of entry containing users (like ou=People,dc=example,dc=com). It's where users will be added using createUser()
+    * method. Under this DN users will be searched using ONELEVEL_SCOPE
     */
    private String containerDN;
 
@@ -104,7 +99,7 @@
       }
       catch (NoSuchElementException e)
       {
-         log.debug("No user found with name: " + userName, e);  
+         log.debug("No user found with name: " + userName, e);
       }
       catch (NamingException e)
       {
@@ -143,13 +138,11 @@
       }
 
 
-
       try
       {
          //
          LdapContext ctx = (LdapContext)getConnectionContext().createInitialContext().lookup(getContainerDN());
 
-
          //We store new entry using set of attributes. This should give more flexibility then
          //extending user object from ContextDir - configure what objectClass place there
          Attributes attrs = new BasicAttributes(true);
@@ -160,9 +153,9 @@
          oc.add("uidObject");
          oc.add("person");
          attrs.put(oc);
-         attrs.put(getUidAttributeID(),userName);
-         attrs.put("sn","");
-         attrs.put("cn","");
+         attrs.put(getUidAttributeID(), userName);
+         attrs.put("sn", "");
+         attrs.put("cn", "");
 
          //TODO: correctly store password... encode it and choose the method?
          attrs.put("userPassword", password);
@@ -170,10 +163,10 @@
 
          String dn = getUidAttributeID().concat("=").concat(userName);
 
-         log.debug("creating ldap entry for: " + dn + "; " + attrs );
+         log.debug("creating ldap entry for: " + dn + "; " + attrs);
          ctx.createSubcontext(dn, attrs);
       }
-      catch(NamingException e)
+      catch (NamingException e)
       {
          throw new IdentityException("Failed to create user", e);
       }
@@ -202,7 +195,7 @@
          log.debug("removing entry: " + ldapu.getDn());
          ctx.unbind(ldapu.getDn());
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          throw new IdentityException("Failed to remove user: ", e);
       }
@@ -253,10 +246,11 @@
    protected LDAPUserImpl createUserInstance(SearchResult sr) throws IdentityException
    {
       LDAPUserImpl ldapu = null;
-      try {
+      try
+      {
 
 
-         log.debug("SearchResult: " + sr );
+         log.debug("SearchResult: " + sr);
 
          Attributes attrs = sr.getAttributes();
          log.debug("Search result attributes: " + attrs);
@@ -267,18 +261,15 @@
          {
             throw new IdentityException("LDAP entry doesn't contain proper attribute:" + getUidAttributeID());
          }
-         ldapu =  new LDAPUserImpl(uida.getID().concat("=").concat((String)uida.get()) + "," + getContainerDN());
+         ldapu = new LDAPUserImpl(uida.getID().concat("=").concat((String)uida.get()) + "," + getContainerDN());
          ldapu.setId((String)uida.get());
 
-
          //TODO:handle password
 
          log.debug("user uid: " + ldapu.getId());
          log.debug("user dn: " + ldapu.getDn());
 
 
-
-
       }
       catch (NamingException e)
       {
@@ -288,7 +279,6 @@
       return ldapu;
    }
 
-
    //**************************
    //*** Getter and Setters
    //**************************

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/LDAPUserProfileModuleImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
+import org.jboss.portal.identity2.User;
 import org.jboss.portal.identity2.UserProfileModule;
-import org.jboss.portal.identity2.User;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import java.util.Set;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticGroupLDAPMembershipStrategyImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticGroupLDAPMembershipStrategyImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticGroupLDAPMembershipStrategyImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.identity2.LDAPMembershipStrategy;
 import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity2.LDAPMembershipStrategy;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import java.util.Set;
 
@@ -36,14 +37,10 @@
    private LDAPConnectionContext connectionContext;
 
 
-   /**
-    * DN under which roles should be searched. Used only when obtaining roles having only User DN.
-    */
+   /** DN under which roles should be searched. Used only when obtaining roles having only User DN. */
    private String roleCtxDN;
 
-   /**
-    * Name of attribute in role entry that point to belonging user
-    */
+   /** Name of attribute in role entry that point to belonging user */
    private String uidAttributeID;
 
 
@@ -87,7 +84,7 @@
    {
       this.roleCtxDN = roleCtxDN;
    }
-   
+
    public String getUidAttributeID()
    {
       return uidAttributeID;

Modified: trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticRoleLDAPMembershipStrategyImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticRoleLDAPMembershipStrategyImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/identity2/ldap/StaticRoleLDAPMembershipStrategyImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.identity2.ldap;
 
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.identity2.LDAPMembershipStrategy;
 import org.jboss.portal.identity.IdentityException;
+import org.jboss.portal.identity2.LDAPMembershipStrategy;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import java.util.Set;
 
@@ -35,14 +36,10 @@
 {
    private LDAPConnectionContext connectionContext;
 
-   /**
-    * DN under which users should be searched. Used only when obtaining users having only Role DN.
-    */
+   /** DN under which users should be searched. Used only when obtaining users having only Role DN. */
    private String userCtxDN;
 
-   /**
-    * Name of attribute in role entry that point to belonging user
-    */
+   /** Name of attribute in role entry that point to belonging user */
    private String roleAttributeID;
 
 

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/DBUserTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,50 +1,50 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
-import org.jboss.portal.test.framework.TestRuntimeContext;
+import junit.framework.TestSuite;
+import org.apache.log4j.Appender;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
 import org.jboss.portal.common.junit.TestCaseFactory;
 import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
 import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
+import org.jboss.portal.common.p3p.P3PConstants;
+import org.jboss.portal.identity.ProfileMap;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.identity.db.DBRoleModuleImpl;
+import org.jboss.portal.identity.db.DBUserModuleImpl;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DataSourceSupport;
 import org.jboss.portal.test.framework.embedded.HibernateSupport;
-import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.identity.db.DBUserModuleImpl;
-import org.jboss.portal.identity.db.DBRoleModuleImpl;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.ProfileMap;
-import org.jboss.portal.common.p3p.P3PConstants;
-import org.apache.log4j.Appender;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
 
+import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
-import java.net.URL;
 
-import junit.framework.TestSuite;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPMembershipStrategyTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPMembershipStrategyTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPMembershipStrategyTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
 import java.util.Map;

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleRoleModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleRoleModuleTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleRoleModuleTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,40 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
 import junit.framework.TestSuite;
-
-import java.net.URL;
-import java.util.Map;
-
+import org.jboss.portal.common.junit.TestCaseFactory;
 import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
 import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
-import org.jboss.portal.common.junit.TestCaseFactory;
-import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.portal.test.framework.TestRuntimeContext;
 import org.jboss.portal.identity2.RoleModule;
+import org.jboss.portal.identity2.ldap.LDAPRoleImpl;
 import org.jboss.portal.identity2.ldap.LDAPRoleModuleImpl;
-import org.jboss.portal.identity2.ldap.LDAPRoleImpl;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DSConfig;
 
+import java.net.URL;
+import java.util.Map;
+
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision: 1.1 $
@@ -85,14 +85,14 @@
    {
       LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
       assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles,dc=jboss,dc=org");
-      assertEquals(ldapr.getName(),"Echo");
+      assertEquals(ldapr.getName(), "Echo");
    }
 
    public void testRemoveRole() throws Exception
    {
       LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
       assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles,dc=jboss,dc=org");
-      assertEquals(ldapr.getName(),"Echo");
+      assertEquals(ldapr.getName(), "Echo");
       roleModule.removeRole("Echo");
       ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
       assertNull(ldapr);
@@ -100,9 +100,9 @@
 
    public void testCreateRole() throws Exception
    {
-      LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.createRole("testRole","testDisplayName");
+      LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.createRole("testRole", "testDisplayName");
       assertNotNull(ldapr);
-      assertEquals("testRole",ldapr.getName());
+      assertEquals("testRole", ldapr.getName());
       //assertEquals("testDisplayName",ldapr.getDisplayName());
 
       ldapr = (LDAPRoleImpl)roleModule.findRoleById("testRole");
@@ -118,7 +118,7 @@
    {
       LDAPRoleImpl ldapr = (LDAPRoleImpl)roleModule.findRoleById("Echo");
       assertEquals(ldapr.getDn(), "cn=Echo,ou=Roles,dc=jboss,dc=org");
-      assertEquals(ldapr.getName(),"Echo");
+      assertEquals(ldapr.getName(), "Echo");
 
       int count = roleModule.getRolesCount();
       assertEquals(2, count);

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleUserModuleTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleUserModuleTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPSimpleUserModuleTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,40 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
+import junit.framework.TestSuite;
+import org.jboss.portal.common.junit.TestCaseFactory;
+import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
+import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
 import org.jboss.portal.identity2.UserModule;
+import org.jboss.portal.identity2.ldap.LDAPUserImpl;
 import org.jboss.portal.identity2.ldap.LDAPUserModuleImpl;
-import org.jboss.portal.identity2.ldap.LDAPUserImpl;
-import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
-import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
-import org.jboss.portal.common.junit.TestCaseFactory;
+import org.jboss.portal.test.framework.TestRuntimeContext;
 import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.portal.test.framework.TestRuntimeContext;
 
+import java.net.URL;
 import java.util.Map;
-import java.net.URL;
 
-import junit.framework.TestSuite;
-
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision: 1.1 $
@@ -64,7 +64,7 @@
       runtimeContext = new TestRuntimeContext("org/jboss/portal/test/identity/ldap-beans.xml");
       runtimeContext.addBean("LDAPTestBean", this);
 
-      LDAPUserModuleImpl userModule = new LDAPUserModuleImpl(); 
+      LDAPUserModuleImpl userModule = new LDAPUserModuleImpl();
       userModule.setConnectionContext(createConnectionContext());
 
       userModule.setContainerDN("ou=People,dc=jboss,dc=org");
@@ -85,7 +85,7 @@
    {
       LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
       assertEquals(ldapu.getDn(), "uid=jduke,ou=People,dc=jboss,dc=org");
-      assertEquals(ldapu.getUserName(),"jduke");
+      assertEquals(ldapu.getUserName(), "jduke");
    }
 
    public void testRemoveUser() throws Exception
@@ -100,9 +100,9 @@
 
    public void testCreateUser() throws Exception
    {
-      LDAPUserImpl ldapu = (LDAPUserImpl)userModule.createUser("testUser","testPassword","email");
+      LDAPUserImpl ldapu = (LDAPUserImpl)userModule.createUser("testUser", "testPassword", "email");
       assertNotNull(ldapu);
-      assertEquals("testUser",ldapu.getUserName());
+      assertEquals("testUser", ldapu.getUserName());
 
       ldapu = (LDAPUserImpl)userModule.findUserById("testUser");
       assertNotNull(ldapu);
@@ -117,7 +117,7 @@
    {
       LDAPUserImpl ldapu = (LDAPUserImpl)userModule.findUserById("jduke");
       assertEquals(ldapu.getDn(), "uid=jduke,ou=People,dc=jboss,dc=org");
-      assertEquals(ldapu.getUserName(),"jduke");
+      assertEquals(ldapu.getUserName(), "jduke");
 
       int count = userModule.getUserCount();
       assertEquals(5, count);

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticGroupStrategyTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticGroupStrategyTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticGroupStrategyTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,38 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
 import junit.framework.TestSuite;
+import org.jboss.portal.common.junit.TestCaseFactory;
+import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
+import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
+import org.jboss.portal.identity2.ldap.StaticGroupLDAPMembershipStrategyImpl;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DSConfig;
 
 import java.net.URL;
 import java.util.Map;
 
-import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
-import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
-import org.jboss.portal.common.junit.TestCaseFactory;
-import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.identity2.ldap.StaticGroupLDAPMembershipStrategyImpl;
-
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision: 1.1 $

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticRoleStrategyTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticRoleStrategyTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPStaticRoleStrategyTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
+import junit.framework.TestSuite;
+import org.jboss.portal.common.junit.TestCaseFactory;
 import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
 import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
-import org.jboss.portal.common.junit.TestCaseFactory;
-import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.identity2.ldap.StaticGroupLDAPMembershipStrategyImpl;
 import org.jboss.portal.identity2.ldap.StaticRoleLDAPMembershipStrategyImpl;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DSConfig;
 
-import junit.framework.TestSuite;
-
 import java.net.URL;
 import java.util.Map;
 
@@ -68,8 +67,8 @@
       mstc = new MembershipStrategyTest();
       mstc.setContext(this);
       mstc.setLDAPMembershipStrategy(strategy);
-      
-      
+
+
       super.setUp();
    }
 }

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,45 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
-import java.net.URL;
-import java.util.Map;
-import java.util.Hashtable;
-
-import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.identity2.ldap.LDAPConnectionContext;
+import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.log4j.Appender;
 import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.Logger;
 import org.apache.log4j.Level;
-import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
+import org.jboss.portal.identity2.ldap.LDAPConnectionContext;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DSConfig;
 
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.NamingEnumeration;
 import javax.naming.Binding;
 import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -79,7 +79,6 @@
    private DSConfig dsConfig;
 
 
-
    public String getName()
    {
       return super.getName() + "," + dsConfig.getName() + "," + dsConfig.getDescription();
@@ -89,7 +88,7 @@
    {
       runtimeContext.start();
 
-      
+
       populate();
    }
 

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/LDAPUserTestCase.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/LDAPUserTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/LDAPUserTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,52 +1,48 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
 import junit.framework.TestSuite;
-
-import java.net.URL;
-import java.util.Map;
-import java.util.Date;
-import java.util.Hashtable;
-
-import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.test.framework.embedded.DSConfig;
-import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
-import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
-import org.jboss.portal.common.junit.TestCaseFactory;
-
+import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
 import org.apache.log4j.Appender;
 import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.SimpleLayout;
-import org.apache.log4j.Logger;
 import org.apache.log4j.Level;
-import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
+import org.jboss.portal.common.junit.TestCaseFactory;
+import org.jboss.portal.common.junit.metadata.TestCaseMetaData;
+import org.jboss.portal.common.junit.metadata.TestCaseParameterMetaData;
+import org.jboss.portal.test.framework.TestRuntimeContext;
+import org.jboss.portal.test.framework.embedded.DSConfig;
 
-
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
+import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.NamingEnumeration;
-import javax.naming.Binding;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -99,12 +95,8 @@
    /** . */
    //private DBUserModuleImpl userModule;
 
-   /**
-    * .
-    */
+   /** . */
    //private DBRoleModuleImpl roleModule;
-
-
    public String getName()
    {
       return super.getName() + "," + dsConfig.getName() + "," + dsConfig.getDescription();

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/MembershipStrategyTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,30 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
 import junit.framework.Assert;
-import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.IdentityException;
-import org.jboss.portal.common.util.CollectionBuilder;
 import org.jboss.portal.identity2.LDAPMembershipStrategy;
 
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Arrays;
-import java.util.Collections;
-
 /**
  * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a>
  * @version $Revision: 2001 $
@@ -78,6 +67,7 @@
    public interface Context
    {
       void begin();
+
       void commit();
    }
 }

Modified: trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/main/org/jboss/portal/test/identity/UserTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.identity;
 
 import junit.framework.Assert;
+import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.identity.IdentityException;
+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 java.util.Set;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Arrays;
-import java.util.Collections;
+import java.util.Set;
 
-import org.jboss.portal.common.util.CollectionBuilder;
-import org.jboss.portal.identity.UserModule;
-import org.jboss.portal.identity.User;
-import org.jboss.portal.identity.RoleModule;
-import org.jboss.portal.identity.Role;
-import org.jboss.portal.identity.IdentityException;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -121,7 +121,7 @@
       Assert.assertEquals("user1", u1.getUserName());
       assertNotNull(roleModule.getRoles(u1));
       Assert.assertEquals(1, roleModule.getRoles(u1).size());
-      Assert.assertEquals("role1", ((Role) roleModule.getRoles(u1).iterator().next()).getName());
+      Assert.assertEquals("role1", ((Role)roleModule.getRoles(u1).iterator().next()).getName());
       Assert.assertEquals(u1.getId(), userModule.findUserById(u1.getId()).getId());
       ctx.commit();
    }
@@ -129,15 +129,15 @@
    public void testFindUser2() throws Exception
    {
       ctx.begin();
-      Set roleNames = new HashSet(Arrays.asList(new Object[] { "role1", "role2" }));
+      Set roleNames = new HashSet(Arrays.asList(new Object[]{"role1", "role2"}));
       User u2 = userModule.findUserByUserName("user2");
       assertNotNull(u2);
       Assert.assertEquals("user2", u2.getUserName());
       assertNotNull(roleModule.getRoles(u2));
       Assert.assertEquals(2, roleModule.getRoles(u2).size());
       Iterator iterator = roleModule.getRoles(u2).iterator();
-      assertTrue(roleNames.contains(((Role) iterator.next()).getName()));
-      assertTrue(roleNames.contains(((Role) iterator.next()).getName()));
+      assertTrue(roleNames.contains(((Role)iterator.next()).getName()));
+      assertTrue(roleNames.contains(((Role)iterator.next()).getName()));
       Assert.assertEquals(u2.getId(), userModule.findUserById(u2.getId()).getId());
       ctx.commit();
    }
@@ -158,12 +158,12 @@
       assertEquals(2, c3.size());
 
       Set s1 = new HashSet();
-      s1.add(((User) c1.iterator().next()).getUserName());
-      s1.add(((User) c2.iterator().next()).getUserName());
+      s1.add(((User)c1.iterator().next()).getUserName());
+      s1.add(((User)c2.iterator().next()).getUserName());
       Set s2 = new HashSet();
       Iterator iterator = c3.iterator();
-      s2.add(((User) iterator.next()).getUserName());
-      s2.add(((User) iterator.next()).getUserName());
+      s2.add(((User)iterator.next()).getUserName());
+      s2.add(((User)iterator.next()).getUserName());
       assertEquals(s1, s2);
       ctx.commit();
    }
@@ -177,7 +177,7 @@
       Assert.assertEquals("user3", u3.getUserName());
       assertNotNull(roleModule.getRoles(u3));
       Assert.assertEquals(1, roleModule.getRoles(u3).size());
-      Assert.assertEquals("role1", ((Role) roleModule.getRoles(u3).iterator().next()).getName());
+      Assert.assertEquals("role1", ((Role)roleModule.getRoles(u3).iterator().next()).getName());
       ctx.commit();
 
       ctx.begin();
@@ -186,7 +186,7 @@
       Assert.assertEquals("user3", u3.getUserName());
       assertNotNull(roleModule.getRoles(u3));
       Assert.assertEquals(1, roleModule.getRoles(u3).size());
-      Assert.assertEquals("role1", ((Role) roleModule.getRoles(u3).iterator().next()).getName());
+      Assert.assertEquals("role1", ((Role)roleModule.getRoles(u3).iterator().next()).getName());
       ctx.commit();
    }
 
@@ -317,12 +317,12 @@
    public void testFindRoles() throws Exception
    {
       ctx.begin();
-      Set roleNames = new HashSet(Arrays.asList(new Object[] { "role1", "role2" }));
+      Set roleNames = new HashSet(Arrays.asList(new Object[]{"role1", "role2"}));
       Set roles = roleModule.findRoles();
       assertEquals(2, roles.size());
       Iterator iterator = roles.iterator();
-      assertTrue(roleNames.contains(((Role) iterator.next()).getName()));
-      assertTrue(roleNames.contains(((Role) iterator.next()).getName()));
+      assertTrue(roleNames.contains(((Role)iterator.next()).getName()));
+      assertTrue(roleNames.contains(((Role)iterator.next()).getName()));
       ctx.commit();
    }
 
@@ -387,6 +387,7 @@
    public interface Context
    {
       void begin();
+
       void commit();
    }
 }

Modified: trunk/identity/src/resources/hibernate/domain.hbm.xml
===================================================================
--- trunk/identity/src/resources/hibernate/domain.hbm.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/resources/hibernate/domain.hbm.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE hibernate-mapping PUBLIC
    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">

Modified: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml
===================================================================
--- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
@@ -23,7 +46,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="driverClass"><inject bean="DataSourceConfig" property="driverClass"/></property>
       <property name="connectionURL"><inject bean="DataSourceConfig" property="connectionURL"/></property>
       <property name="userName"><inject bean="DataSourceConfig" property="userName"/></property>

Modified: trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml
===================================================================
--- trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">

Modified: trunk/jems/build.xml
===================================================================
--- trunk/jems/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
@@ -63,7 +86,7 @@
       <property name="junit.formatter.usefile" value="true"/>
 
       <!-- Configure thirdparty libraries -->
-       &libraries;
+      &libraries;
       <path id="library.classpath">
          <path refid="beanshell.beanshell.classpath"/>
          <path refid="jboss.cache.classpath"/>
@@ -104,7 +127,7 @@
        <pathelement location="${sun.servlet.lib}/servlet-api.jar"/>
      </path>
      <taskdef name="webdoclet"
-      	     classname="xdoclet.modules.web.WebDocletTask"
+              classname="xdoclet.modules.web.WebDocletTask"
               classpathref="webdoclet.task.classpath"/>
    </target>
 

Modified: trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/AbstractJBossService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.as.system;
 
 import org.jboss.logging.Logger;

Modified: trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.as.system;
 
-public interface JBossService {
+public interface JBossService
+{
 
    public void create() throws Exception;
 

Modified: trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/JBossServiceModelMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.as.system;
 
+import org.apache.log4j.Logger;
 import org.jboss.mx.modelmbean.ModelMBeanInvoker;
+import org.jboss.portal.common.mx.JavaBeanModelMBeanBuilder;
 import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.portal.common.mx.JavaBeanModelMBeanBuilder;
 import org.w3c.dom.Element;
-import org.apache.log4j.Logger;
 
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;

Modified: trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/LifeCycleAdapter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.as.system;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.AttributeChangeNotification;
-import javax.management.MBeanServer;
-import javax.management.MBeanServerNotification;
-import javax.management.Notification;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-
 import org.apache.log4j.Logger;
 import org.jboss.mx.util.MBeanProxy;
 import org.jboss.mx.util.MBeanProxyCreationException;
@@ -42,13 +31,22 @@
 import org.jboss.system.ServiceControllerMBean;
 import org.jboss.system.ServiceMBean;
 
+import javax.management.AttributeChangeNotification;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerNotification;
+import javax.management.Notification;
+import javax.management.NotificationFilter;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
- * Adapts JBoss lifecycle event handling and multiplex event from
- * different sources into one source.
+ * Adapts JBoss lifecycle event handling and multiplex event from different sources into one source.
+ * <p/>
+ * It requires an MBeanServer and a ServiceController plugged into the MBeanServer.
  *
- * It requires an MBeanServer and a ServiceController plugged
- * into the MBeanServer.
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -73,9 +71,7 @@
    /** The watched mbeans. */
    private Set watched;
 
-   /**
-    * Create the rule for the given server.
-    */
+   /** Create the rule for the given server. */
    public LifeCycleAdapter(MBeanServer server)
    {
       try
@@ -94,7 +90,7 @@
    /**
     * Start the adapter.
     *
-    * @exception IllegalStateException if the service controller is missing
+    * @throws IllegalStateException if the service controller is missing
     */
    public void start() throws IllegalStateException
    {
@@ -105,9 +101,7 @@
       }
    }
 
-   /**
-    * Stop the adapter
-    */
+   /** Stop the adapter */
    public void stop()
    {
       JMX.removeNotificationListener(server, ServiceControllerMBean.OBJECT_NAME, listener);
@@ -177,10 +171,12 @@
    {
       /** The serialVersionUID */
       private static final long serialVersionUID = 4049015398272819164L;
+
       public boolean isNotificationEnabled(Notification notification)
       {
          return true;
       }
+
       public void handleNotification(Notification notification, Object handback)
       {
          String type = notification.getType();
@@ -203,21 +199,21 @@
             if ("State".equals(acn.getAttributeName()))
             {
                int state = ((Integer)acn.getNewValue()).intValue();
-               switch(state)
+               switch (state)
                {
-               case ServiceMBean.STARTING:
-                  starting(name);
-                  break;
-               case ServiceMBean.STARTED:
-                  started(name);
-                  break;
-               case ServiceMBean.STOPPING:
-                  stopping(name);
-                  break;
-               case ServiceMBean.STOPPED:
-                  stopped(name);
-                  break;
-               default:
+                  case ServiceMBean.STARTING:
+                     starting(name);
+                     break;
+                  case ServiceMBean.STARTED:
+                     started(name);
+                     break;
+                  case ServiceMBean.STOPPING:
+                     stopping(name);
+                     break;
+                  case ServiceMBean.STOPPED:
+                     stopped(name);
+                     break;
+                  default:
                }
             }
          }

Modified: trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/as/system/LifecycleInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.as.system;
 
-import javax.management.ObjectName;
 import javax.management.InstanceNotFoundException;
 import javax.management.MBeanException;
+import javax.management.ObjectName;
 import javax.management.ReflectionException;
 
 /**

Modified: trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.ha;
 
 import org.jboss.ha.singleton.HASingletonSupport;
@@ -171,7 +172,7 @@
             }
             else
             {
-               throw (Error)t;
+               throw(Error)t;
             }
          }
       }

Modified: trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/ha/HASingletonInvokerMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.ha;
 
 import org.jboss.ha.singleton.HASingletonMBean;
-import org.jboss.portal.jems.ha.HASingletonInvoker;
 
 import javax.management.ObjectName;
 import java.util.Properties;
 
 /**
- * The ha singleton invoker service extends the ha singleton service and adds
- * the capability to invoke the singleton service from the cluster.
+ * The ha singleton invoker service extends the ha singleton service and adds the capability to invoke the singleton
+ * service from the cluster.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -37,81 +37,52 @@
 public interface HASingletonInvokerMBean extends HASingletonMBean
 {
 
-   /**
-    * Get the callback of the invoker.
-    */
+   /** Get the callback of the invoker. */
    HASingletonInvoker.Callback getCallback();
 
-   /**
-    * @see #getCallback()
-    */
+   /** @see #getCallback() */
    void setCallback(HASingletonInvoker.Callback callback);
 
-   /**
-    * Return the JNDI name under which the proxy is bound.
-    */
+   /** Return the JNDI name under which the proxy is bound. */
    String getJNDIName();
 
-   /**
-    * @see #getJNDIName()
-    */
+   /** @see #getJNDIName() */
    void setJNDIName(String jndiName);
 
-   /**
-    * Return the name of the proxy factory to use.
-    */
+   /** Return the name of the proxy factory to use. */
    ObjectName getProxyFactory();
 
-   /**
-    * @see #getProxyFactory()
-    */
+   /** @see #getProxyFactory() */
    void setProxyFactory(ObjectName proxyFactory);
 
-   /**
-    * Return the JNDI configuration to lookup the proxy.
-    */
+   /** Return the JNDI configuration to lookup the proxy. */
    Properties getJNDIProperties();
 
-   /**
-    * @see #getJNDIProperties()
-    */
+   /** @see #getJNDIProperties() */
    void setJNDIProperties(Properties jndiProperties);
 
-   /**
-    * Return the max number of retries when an invocation is done.
-    */
+   /** Return the max number of retries when an invocation is done. */
    int getMaxRetries();
 
-   /**
-    * @see #getMaxRetries()
-    */
+   /** @see #getMaxRetries() */
    void setMaxRetries(int maxRetries);
 
-   /**
-    * Return the time that the thread will sleep before looking up a proxy during fail over.
-    */
+   /** Return the time that the thread will sleep before looking up a proxy during fail over. */
    long getRetryWaitingTimeMS();
 
-   /**
-    * @see #getRetryWaitingTimeMS()
-    */
+   /** @see #getRetryWaitingTimeMS() */
    void setRetryWaitingTimeMS(long retryWaitingTimeMS);
 
-   /**
-    * Return the proxy, if it is cached then it will return the cached proxy otherwise
-    * it will perform a JNDI lookup.
-    */
+   /** Return the proxy, if it is cached then it will return the cached proxy otherwise it will perform a JNDI lookup. */
    HASingletonInvoker.Proxy lookupProxy();
 
    /**
-    * Invoke the service through the invoker. When the service proxy throws an exception the invoker
-    * waits for a specific duration and then perform a new lookup for a certain amount of time.
+    * Invoke the service through the invoker. When the service proxy throws an exception the invoker waits for a
+    * specific duration and then perform a new lookup for a certain amount of time.
     */
    Object invoke(String methodName, Class[] types, Object[] args) throws Exception;
 
-   /**
-    * Contract layer that defines the interactions between the service and the ha invoker.
-    */
+   /** Contract layer that defines the interactions between the service and the ha invoker. */
    interface Callback
    {
       /**
@@ -120,30 +91,20 @@
        */
       void setInvoker(HASingletonInvoker invoker);
 
-      /**
-       * Start the singleton.
-       */
+      /** Start the singleton. */
       void startSingleton();
 
-      /**
-       * Stop the singleton.
-       */
+      /** Stop the singleton. */
       void stopSingleton();
 
-      /**
-       * Invocation callback
-       */
+      /** Invocation callback */
       Object invoke(String methodName, Class[] types, Object[] args) throws Exception;
 
-      /**
-       * Provide a simple display name for logging purpose. 
-       */
+      /** Provide a simple display name for logging purpose. */
       String getDisplayName();
    }
 
-   /**
-    * The proxy interface bound in JNDI.
-    */
+   /** The proxy interface bound in JNDI. */
    interface Proxy
    {
       Object invoke(String methodName, Class[] types, Object[] args) throws Exception;

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 import org.jboss.portal.common.util.Tools;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.sql.Blob;
 import java.sql.SQLException;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.OutputStream;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/CacheableBlobUserType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
-import org.hibernate.usertype.UserType;
 import org.hibernate.HibernateException;
+import org.hibernate.usertype.UserType;
 
+import java.io.Serializable;
+import java.sql.Blob;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.PreparedStatement;
 import java.sql.Types;
-import java.sql.Blob;
-import java.io.Serializable;
-import java.io.InputStream;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -50,7 +49,7 @@
 
    public Class returnedClass()
    {
-     return Blob.class;
+      return Blob.class;
    }
 
    public boolean equals(Object x, Object y) throws HibernateException

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/ContextObject.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 /**

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/DialectFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 import org.hibernate.HibernateException;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
- * Ripped off hibernate 3.1 that is not in 3.0.
- * A factory for generating Dialect instances.
+ * Ripped off hibernate 3.1 that is not in 3.0. A factory for generating Dialect instances.
  *
  * @author Steve Ebersole
  * @version $Revision$
@@ -42,8 +42,7 @@
    }
 
    /**
-    * Determine the appropriate Dialect to use given the database product name
-    * and major version.
+    * Determine the appropriate Dialect to use given the database product name and major version.
     *
     * @param databaseName         The name of the database product (obtained from metadata).
     * @param databaseMajorVersion The major version of the database product (obtained from metadata).
@@ -66,18 +65,15 @@
    }
 
    /**
-    * For a given database product name, instances of
-    * DatabaseDialectMapper know which Dialect to use for different versions.
+    * For a given database product name, instances of DatabaseDialectMapper know which Dialect to use for different
+    * versions.
     */
    public static interface DatabaseDialectMapper
    {
       public String getDialectClass(int majorVersion);
    }
 
-   /**
-    * A simple DatabaseDialectMapper for dialects which are independent
-    * of the underlying database product version.
-    */
+   /** A simple DatabaseDialectMapper for dialects which are independent of the underlying database product version. */
    public static class VersionInsensitiveMapper implements DatabaseDialectMapper
    {
       private String dialectClassName;

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/HibernateProvider.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
+import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
-import org.hibernate.SessionFactory;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -31,5 +32,6 @@
 public interface HibernateProvider
 {
    Configuration getConfig();
+
    SessionFactory getSessionFactory();
 }

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProvider.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 import org.jboss.cache.TreeCache;

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/JBossTreeCacheProviderMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
+import org.jboss.cache.TreeCache;
+
 import javax.management.ObjectName;
 
-import org.jboss.cache.TreeCache;
-
 /**
  */
 public interface JBossTreeCacheProviderMBean

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/JMXTreeCacheProvider.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
+import org.apache.log4j.Logger;
 import org.hibernate.cache.Cache;
 import org.hibernate.cache.CacheException;
+import org.hibernate.cache.CacheProvider;
 import org.hibernate.cache.TreeCache;
-import org.hibernate.cache.CacheProvider;
+import org.jboss.mx.util.MBeanProxy;
 import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.mx.util.MBeanProxy;
-import org.apache.log4j.Logger;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/MagicString.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,41 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
 import org.hibernate.usertype.UserType;
-import org.hibernate.HibernateException;
-import org.hibernate.Hibernate;
 
 import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.ResultSet;
-import java.sql.PreparedStatement;
 import java.sql.Types;
 
 /**
- * An hibernate custom type that handles the fact that oracle stores an empty string
- * as null. That types changes the semantic of string with the fact that a returned null string
- * is equals to an empty string.
- *
+ * An hibernate custom type that handles the fact that oracle stores an empty string as null. That types changes the
+ * semantic of string with the fact that a returned null string is equals to an empty string.
+ * <p/>
  * I did not found a good name for that class so I choosed MagicString but it has nothing magic.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/ObjectContextualizer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 import org.hibernate.SessionFactory;
-import org.hibernate.impl.SessionFactoryImpl;
 import org.hibernate.event.EventListeners;
+import org.hibernate.event.PostLoadEvent;
 import org.hibernate.event.PostLoadEventListener;
-import org.hibernate.event.PostLoadEvent;
+import org.hibernate.impl.SessionFactoryImpl;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -46,7 +47,7 @@
       EventListeners listeners = ((SessionFactoryImpl)sessionFactory).getEventListeners();
       PostLoadEventListener[] lels1 = listeners.getPostLoadEventListeners();
       PostLoadEventListener[] lels2 = new PostLoadEventListener[lels1.length + 1];
-      System.arraycopy(lels1,  0, lels2, 1, lels1.length);
+      System.arraycopy(lels1, 0, lels2, 1, lels1.length);
       lels2[0] = new PostLoadEventListener()
       {
          public void onPostLoad(PostLoadEvent postLoadEvent)

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/SessionFactoryBinder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 import bsh.EvalError;
@@ -32,11 +33,11 @@
 import org.hibernate.metadata.ClassMetadata;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.hbm2ddl.SchemaUpdate;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.common.util.CLLoader;
 import org.jboss.portal.common.util.LoaderResource;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.URLTools;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
@@ -249,7 +250,7 @@
          int check = doCheck();
          switch (check)
          {
-            case RESULT_NONE :
+            case RESULT_NONE:
                break;
             case RESULT_UPDATE:
                updateSchema();

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/StringWrapperUserType.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
+import org.hibernate.HibernateException;
 import org.hibernate.usertype.UserType;
-import org.hibernate.HibernateException;
 
+import java.io.Serializable;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.PreparedStatement;
 import java.sql.Types;
-import java.io.Serializable;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/TreeCacheProvider.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.jems.hibernate;
 
 import org.jboss.cache.TreeCache;
 
 /**
- * Provide a tree cache. <code>org.jboss.cache.TreeCache</code> is a concrete class and cannot be proxy injected.
- * This interface enable injection and gives a way to the dependant to retrieve the cache.
+ * Provide a tree cache. <code>org.jboss.cache.TreeCache</code> is a concrete class and cannot be proxy injected. This
+ * interface enable injection and gives a way to the dependant to retrieve the cache.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/portlet/build.xml
===================================================================
--- trunk/portlet/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
@@ -175,9 +198,9 @@
       <jar jarfile="${build.lib}/portal-portlet-test-lib.jar">
          <fileset dir="${build.classes}" includes="org/jboss/portal/portlet/test/**"/>	     
       </jar>
-	
-	  <!-- Portlet test framework lib jar...this is used by the cms clustering testcases -->
-	  <jar jarfile="${build.lib}/portal-portlet-testframework-lib.jar">	  	
+
+      <!-- Portlet test framework lib jar...this is used by the cms clustering testcases -->
+      <jar jarfile="${build.lib}/portal-portlet-testframework-lib.jar">
 		<fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
 	  </jar>
 
@@ -435,39 +458,69 @@
          </x-sysproperty>
          <x-test>
             <!--Spec TCK Assertions tests-->
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.dispatcher.DispatcherTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletconfig.PortletConfigTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletrequests.PortletRequestTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletmode.PortletModeTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletresponses.PortletResponsesTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.preferences.PreferencesTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletsession.PortletSessionTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletinterface.PortletInterfaceTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portleturl.PortletURLTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.windowstates.WindowStatesTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.tck.portletcontext.PortletContextTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.dispatcher.DispatcherTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletconfig.PortletConfigTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletrequests.PortletRequestTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletmode.PortletModeTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletresponses.PortletResponsesTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.preferences.PreferencesTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletsession.PortletSessionTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletinterface.PortletInterfaceTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portleturl.PortletURLTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.windowstates.WindowStatesTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.tck.portletcontext.PortletContextTestSuite"/>
             <!--API Tests-->
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portletconfig.PortletConfigAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portletmode.PortletModeAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.windowstate.WindowStateAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portletsessionutil.PortletSessionUtilAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portalcontext.PortalContextAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portletcontext.PortletContextAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portleturl.PortletURLAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portletpreferences.PortletPreferencesAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.portletsession.PortletSessionAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.actionrequest.ActionRequestAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.renderrequest.RenderRequestAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.actionresponse.ActionResponseAPITestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.api.renderresponse.RenderResponseAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portletconfig.PortletConfigAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portletmode.PortletModeAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.windowstate.WindowStateAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portletsessionutil.PortletSessionUtilAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portalcontext.PortalContextAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portletcontext.PortletContextAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portleturl.PortletURLAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portletpreferences.PortletPreferencesAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.portletsession.PortletSessionAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.actionrequest.ActionRequestAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.renderrequest.RenderRequestAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.actionresponse.ActionResponseAPITestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.api.renderresponse.RenderResponseAPITestSuite"/>
             <!--Ext Tests-->
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.preferences.PreferencesTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.ext.preferences.PreferencesTestSuite"/>
             <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.session.SessionTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.portletresponses.PortletResponsesTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.portletrequests.PortletRequestTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.portletmode.PortletModeTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.portletconfig.PortletConfigTestSuite"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.ext.dispatcher.DispatcherTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.ext.portletresponses.PortletResponsesTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.ext.portletrequests.PortletRequestTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.ext.portletmode.PortletModeTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.ext.portletconfig.PortletConfigTestSuite"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.jsr168.ext.dispatcher.DispatcherTestSuite"/>
             <!--Misc Tests-->
             <test todir="${test.reports}" name="org.jboss.portal.test.portlet.jsr168.misc.log4j.Log4jTestSuite"/>
          </x-test>
@@ -515,10 +568,14 @@
       <execute-tests>
          <x-test>
             <test todir="${test.reports}" name="org.jboss.portal.test.portlet.deployment.UnmarshallerTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreProducerStatefulPortletInvokerTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.RemoteStoreProducerStatefulPortletInvokerTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.LocalStoreConsumerStatefulPortletInvokerTestCase"/>
-            <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.RemoteStoreConsumerStatefulPortletInvokerTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.state.LocalStoreProducerStatefulPortletInvokerTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.state.RemoteStoreProducerStatefulPortletInvokerTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.state.LocalStoreConsumerStatefulPortletInvokerTestCase"/>
+            <test todir="${test.reports}"
+                  name="org.jboss.portal.test.portlet.state.RemoteStoreConsumerStatefulPortletInvokerTestCase"/>
             <test todir="${test.reports}" name="org.jboss.portal.test.portlet.state.StateConverterV0TestCase"/>
             <test todir="${test.reports}" name="org.jboss.portal.test.portlet.PortletRequestDecoderTestCase"/>
             <test todir="${test.reports}" name="org.jboss.portal.test.portlet.ParametersTestCase"/>
@@ -595,7 +652,7 @@
    <target name="reports" depends="init">
       <mkdir dir="${build.reports}"/>
       <junitreport todir="${build.reports}">
-         <fileset dir="${test.reports}" >
+         <fileset dir="${test.reports}">
             <include name="TEST-*.xml"/>
          </fileset>
          <report format="frames" todir="${build.reports}/html"/>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/ActionURL.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/ActionURL.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/ActionURL.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/InvalidPortletIdException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/InvokerUnavailableException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/NoSuchPortletException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/OpaqueStateString.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/Parameters.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/Parameters.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/Parameters.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 import org.jboss.portal.common.util.ParameterMap;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Arrays;
 
 
 /**
@@ -71,11 +72,11 @@
     * Copy the parameter map to initialize the object state.
     *
     * @throws IllegalArgumentException if the parameter map is null or not valid
-    * @throws NullPointerException if the map contains a null key or a null value
-    * @throws IllegalArgumentException if the map is null or it contains a value with
-    *         a zero length array or a null element in the array
-    * @throws ClassCastException if the map contains a key that is not a string or a value that
-    *         is not a string array
+    * @throws NullPointerException     if the map contains a null key or a null value
+    * @throws IllegalArgumentException if the map is null or it contains a value with a zero length array or a null
+    *                                  element in the array
+    * @throws ClassCastException       if the map contains a key that is not a string or a value that is not a string
+    *                                  array
     */
    public Parameters(Map parameterMap) throws NullPointerException, ClassCastException, IllegalArgumentException
    {
@@ -136,7 +137,7 @@
     *
     * @param name   the parameter name
     * @param values the parameter values
-    * @throws NullPointerException if the name or the value is null
+    * @throws NullPointerException     if the name or the value is null
     * @throws IllegalArgumentException if the values length is zero or contains a null element
     */
    public void setValues(String name, String[] values) throws NullPointerException, IllegalArgumentException
@@ -145,18 +146,16 @@
    }
 
    /**
-    * Append the content of the argument map to that map. If both maps
-    * contains an entry sharing the same key, then the string arrays or the two entries will
-    * be concatenated into a single array. Each entry present on the argument map
-    * and not in the current map will be kept as is. The argument validation is performed
-    * before the state is updated.
+    * Append the content of the argument map to that map. If both maps contains an entry sharing the same key, then the
+    * string arrays or the two entries will be concatenated into a single array. Each entry present on the argument map
+    * and not in the current map will be kept as is. The argument validation is performed before the state is updated.
     *
     * @param params the parameters to appends
-    * @throws NullPointerException if the map contains a null key or a null value
-    * @throws IllegalArgumentException if the map is null or it contains a value with
-    *         a zero length array or a null element in the array
-    * @throws ClassCastException if the map contains a key that is not a string or a value that
-    *         is not a string array
+    * @throws NullPointerException     if the map contains a null key or a null value
+    * @throws IllegalArgumentException if the map is null or it contains a value with a zero length array or a null
+    *                                  element in the array
+    * @throws ClassCastException       if the map contains a key that is not a string or a value that is not a string
+    *                                  array
     */
    public void append(Map params) throws ClassCastException, NullPointerException, IllegalArgumentException
    {
@@ -167,15 +166,15 @@
    }
 
    /**
-    * Replace all the existing parameters with the new ones. The argument validation is performed
-    * before the state is updated.
+    * Replace all the existing parameters with the new ones. The argument validation is performed before the state is
+    * updated.
     *
     * @param params the parameters to replace
-    * @throws NullPointerException if the map contains a null key or a null value
-    * @throws IllegalArgumentException if the map is null or it contains a value with
-    *         a zero length array or a null element in the array
-    * @throws ClassCastException if the map contains a key that is not a string or a value that
-    *         is not a string array
+    * @throws NullPointerException     if the map contains a null key or a null value
+    * @throws IllegalArgumentException if the map is null or it contains a value with a zero length array or a null
+    *                                  element in the array
+    * @throws ClassCastException       if the map contains a key that is not a string or a value that is not a string
+    *                                  array
     */
    public void replace(Map params)
    {
@@ -186,12 +185,10 @@
       putAll(params);
    }
 
-   /**
-    * Append actual implementation.
-    */
+   /** Append actual implementation. */
    private void internalAppend(Map params)
    {
-      for (Iterator entries = params.entrySet().iterator();entries.hasNext();)
+      for (Iterator entries = params.entrySet().iterator(); entries.hasNext();)
       {
          Map.Entry entry = (Map.Entry)entries.next();
          String name = (String)entry.getKey();
@@ -216,9 +213,7 @@
       }
    }
 
-   /**
-    * Compare to parameters objects.
-    */
+   /** Compare to parameters objects. */
    public boolean equals(Object o)
    {
       if (o == this)

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/ParametersStateString.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 import org.jboss.portal.common.util.Base64;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/Portlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/Portlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/Portlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 import org.jboss.portal.portlet.info.PortletInfo;
@@ -48,8 +49,8 @@
    /**
     * Determines whether the described portlet is remote or not.
     *
-    * @return <code>true</code> if the described portlet runs in a remote context (such as WSRP),
-    *         <code>false</code> otherwise
+    * @return <code>true</code> if the described portlet runs in a remote context (such as WSRP), <code>false</code>
+    *         otherwise
     */
    boolean isRemote();
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/PortletCloneFailedException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/PortletContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/PortletContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/PortletContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 import java.io.Serializable;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.state.PropertyChange;
-import org.jboss.portal.portlet.state.PropertyMap;
 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 java.util.List;
 import java.util.Set;
@@ -67,7 +65,7 @@
     * Clone a portlet.
     *
     * @return the clone id
-    * @throws IllegalArgumentException if the portletId is null
+    * @throws IllegalArgumentException      if the portletId is null
     * @throws UnsupportedOperationException if the invoker does not support this operation
     */
    PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -77,7 +75,7 @@
     *
     * @param portletContexts a list of portlet contexts to destroy
     * @return a list of portlet ids that were not destroyed during the operation
-    * @throws IllegalArgumentException if the portletId is null
+    * @throws IllegalArgumentException      if the portletId is null
     * @throws UnsupportedOperationException if the invoker does not support this operation
     */
    List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -86,9 +84,9 @@
     * Return a subset of the properties of the specified portlet.
     *
     * @param portletContext the portlet context
-    * @param keys the set of keys to retrieve
+    * @param keys           the set of keys to retrieve
     * @return the properties
-    * @throws IllegalArgumentException if the portletId or the keys arguments are null
+    * @throws IllegalArgumentException      if the portletId or the keys arguments are null
     * @throws UnsupportedOperationException if the invoker does not support this operation
     */
    PropertyMap getProperties(PortletContext portletContext, Set keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -98,7 +96,7 @@
     *
     * @param portletContext the portlet context
     * @return the properties
-    * @throws IllegalArgumentException if the portletId is null
+    * @throws IllegalArgumentException      if the portletId is null
     * @throws UnsupportedOperationException if the invoker does not support this operation
     */
    PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;
@@ -107,8 +105,8 @@
     * Set the properties on the specified portlet.
     *
     * @param portletContext the portlet context
-    * @param changes the changes
-    * @throws IllegalArgumentException if the portletId or the properties is null
+    * @param changes        the changes
+    * @throws IllegalArgumentException      if the portletId or the properties is null
     * @throws UnsupportedOperationException if the invoker does not support this operation
     */
    PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/PortletInvokerException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
 import java.util.Iterator;
 import java.util.Map;
 
 /**
- * This class is a possible implementation for the behavior of a request made to a portlet.
- * Which means that this implementation does not preclude other implementations.  
+ * This class is a possible implementation for the behavior of a request made to a portlet. Which means that this
+ * implementation does not preclude other implementations.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -157,7 +158,7 @@
          }
          else
          {
-            windowState =  null;
+            windowState = null;
          }
 
          //

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/PortletURL.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/PortletURL.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/PortletURL.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/Properties.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/Properties.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/Properties.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -44,7 +45,7 @@
    }
 
    /**
-    * @param name the property name
+    * @param name  the property name
     * @param value the property value
     * @throws IllegalArgumentException if name or value is null
     */
@@ -82,7 +83,7 @@
    }
 
    /**
-    * @param name the property name
+    * @param name  the property name
     * @param value the property value
     * @throws IllegalArgumentException if name or value is null
     */
@@ -103,9 +104,7 @@
       content.put(name, value);
    }
 
-   /**
-    * Clear the properties.
-    */
+   /** Clear the properties. */
    public void clear()
    {
       if (content != null)

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/RenderURL.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/RenderURL.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/RenderURL.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/StateEvent.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/StateEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/StateEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/StateString.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/StateString.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/StateString.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 import java.io.Serializable;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/StatefulPortletContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/TransportGuarantee.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet;
 
 /**
@@ -47,7 +48,7 @@
    /**
     *
     */
-   private static final TransportGuarantee[] ALL = {NONE,INTEGRAL,CONFIDENTIAL};
+   private static final TransportGuarantee[] ALL = {NONE, INTEGRAL, CONFIDENTIAL};
 
    /**
     *
@@ -62,7 +63,7 @@
    /**
     *
     */
-   private static final String[] NAMES = {"NONE","INTEGRAL","CONFIDENTIAL"};
+   private static final String[] NAMES = {"NONE", "INTEGRAL", "CONFIDENTIAL"};
 
    public static TransportGuarantee decode(String name)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.container.PortletApplication;
 import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.container.PortletApplication;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.spi.RequestContext;
-import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.server.servlet.CommandServlet;
 import org.jboss.portal.server.servlet.ServletCommand;
 
@@ -80,7 +81,7 @@
          //
          if (response instanceof Exception)
          {
-            throw (Exception)response;
+            throw(Exception)response;
          }
          else
          {
@@ -100,7 +101,7 @@
          if (t instanceof Error)
          {
             // Rethrow any error
-            throw (Error)t;
+            throw(Error)t;
          }
          else if (t == null)
          {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
+import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.common.invocation.InvocationException;
 
 /**
- * This interceptor get the current webapp context path and adds it to the set of the collected
- * context path.
+ * This interceptor get the current webapp context path and adds it to the set of the collected context path.
  *
- * 
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -27,9 +28,7 @@
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.Mode;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -61,9 +60,7 @@
       return invocation.invokeNext();
    }
 
-   /**
-    * Compute the supported modes for this invocation.
-    */
+   /** Compute the supported modes for this invocation. */
    protected Set getModes(PortletInvocation invocation)
    {
       // Get content type

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortalSessionSynchronizationInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
 import org.jboss.portal.common.invocation.InvocationException;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/PortletSessionSynchronizationInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.SessionInfo;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.session.SessionListener;
 import org.jboss.portal.portlet.session.SubSession;
-import org.jboss.portal.portlet.session.SessionListener;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.SessionInfo;
-import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.server.ServerInvocation;
 
 import java.util.List;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ProducerCacheInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.info.CacheInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.CacheInfo;
+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.common.invocation.InvocationException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.TransportGuarantee;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.SecurityInfo;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
 import org.jboss.portal.portlet.spi.SecurityContext;
-import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.invocation.response.InsufficientTransportGuaranteeResponse;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.SecurityInfo;
 
 /**
  * Implement security constaint defined by the portlet spec.
  *
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,44 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
+import org.jboss.portal.common.concurrent.Valve;
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.container.PortletApplicationImpl;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
-import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
-import org.jboss.portal.portlet.container.PortletApplicationImpl;
-import org.jboss.portal.common.concurrent.Valve;
 
 /**
- * This aspect has two responsabilities :<br/>
- * <ul>
- *    <li>continue the request only if the portlet container valve is open.
- *        When the valle is closed, it will return an unavailable response to the caller.
- *        When the valve is open then the current thread of execution enters the valve
- *        for the duration of the call.</li>
- *    <li> if the response from the next aspect is an unavailable result, stop the container
- *         in order to destroy the portlet and implement this part of the portlet specification.</li>
- * </ul>
+ * This aspect has two responsabilities :<br/> <ul> <li>continue the request only if the portlet container valve is
+ * open. When the valle is closed, it will return an unavailable response to the caller. When the valve is open then the
+ * current thread of execution enters the valve for the duration of the call.</li> <li> if the response from the next
+ * aspect is an unavailable result, stop the container in order to destroy the portlet and implement this part of the
+ * portlet specification.</li> </ul>
  *
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.aspects.portlet;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -31,7 +32,6 @@
 /**
  * The WindowStatesInterceptor computes the window state for the request as well as the supported window states.
  *
- * 
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -55,9 +55,7 @@
       return invocation.invokeNext();
    }
 
-   /**
-    * Compute the supported window states for this invocation.
-    */
+   /** Compute the supported window states for this invocation. */
    protected Set getWindowStates(PortletInvocation invocation) throws InvocationException
    {
       return new HashSet(invocation.getPortalContext().getWindowStates());

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
-import org.jboss.portal.portlet.container.PortletContainer;
-
 import java.util.Set;
 
 /**
@@ -31,25 +30,17 @@
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public interface PortletApplication 
+public interface PortletApplication
 {
-   /**
-    * Return the web app id.
-    */
+   /** Return the web app id. */
    String getId();
 
-   /**
-    * Return the set of components part of this web application.
-    */
+   /** Return the set of components part of this web application. */
    Set getPortletContainers();
 
-   /**
-    * Return a specific component.
-    */
+   /** Return a specific component. */
    PortletContainer getPortletContainer(String id);
 
-   /**
-    * Return the porlet application context.
-    */
+   /** Return the porlet application context. */
    PortletApplicationContext getContext();
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
 import javax.servlet.ServletContext;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
 import org.jboss.portal.portlet.impl.jsr168.APIFactory;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
-import org.jboss.kernel.Kernel;
-import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.kernel.spi.dependency.KernelControllerContextAware;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
 
 import javax.servlet.ServletContext;
 
@@ -131,11 +132,11 @@
       {
          if (throwable instanceof Exception)
          {
-            throw (Exception)throwable;
+            throw(Exception)throwable;
          }
          else if (throwable instanceof Error)
          {
-            throw (Error)throwable;
+            throw(Error)throwable;
          }
          else
          {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.impl.jsr168.APIFactory;
 import org.jboss.portal.portlet.impl.jsr168.PortletContextImpl;
-import org.jboss.portal.portlet.impl.jsr168.APIFactory;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import javax.portlet.PortletContext;
 import java.util.HashSet;
@@ -34,7 +35,6 @@
 import java.util.Set;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
-import org.jboss.portal.portlet.container.PortletContainer;
-
 import java.util.Collection;
 
 /**
@@ -31,38 +30,24 @@
  */
 public interface PortletApplicationRegistry
 {
-   /**
-    * Register a portlet application.
-    */
+   /** Register a portlet application. */
    void registerPortletApplication(PortletApplication portletApplication);
 
-   /**
-    * Unregister a portlet application.
-    */
+   /** Unregister a portlet application. */
    void unregisterPortletApplication(PortletApplication portletApplication);
 
-   /**
-    * Register a portlet.
-    */
+   /** Register a portlet. */
    void registerPortlet(PortletContainer portlet);
 
-   /**
-    * Unregister a portlet.
-    */
+   /** Unregister a portlet. */
    void unregisterPortlet(PortletContainer portlet);
 
-   /**
-    * Return an immutable list all the known portlet application in the registry.
-    */
+   /** Return an immutable list all the known portlet application in the registry. */
    Collection getPortletApplications();
 
-   /**
-    * Return a portlet app using its id or null if it does not exist.
-    */
+   /** Return a portlet app using its id or null if it does not exist. */
    PortletApplication getPortletApplication(String id);
 
-   /**
-    * Return a component using its id or null if it does not exist.
-    */
+   /** Return a component using its id or null if it does not exist. */
    PortletContainer getPortletContainer(String id);
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistryImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
 import org.jboss.portal.jems.as.system.AbstractJBossService;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
 import org.jboss.logging.Logger;
 import org.jboss.portal.common.concurrent.Valve;
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
 import org.jboss.portal.portlet.container.info.ContentTypes;
@@ -45,11 +46,11 @@
 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.metadata.JBossPortletMetaData;
 import org.jboss.portal.portlet.invocation.response.ErrorResponse;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.invocation.response.SecurityErrorResponse;
 import org.jboss.portal.portlet.invocation.response.UnavailableResponse;
+import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 
 import javax.portlet.Portlet;
 import javax.portlet.PortletConfig;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerAdapter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
-import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.container.PortletApplicationImpl;
-import org.jboss.portal.portlet.container.PortletApplicationContextImpl;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletContainerInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,47 +1,48 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
-import org.jboss.portal.common.invocation.InvocationException;
 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.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.NoSuchPortletException;
 import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.NoSuchPortletException;
+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.PortletContext;
 import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
 
-import java.util.Set;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * An implementation of portlet invoker that makes a call to a portlet container.
@@ -141,11 +142,11 @@
       {
          if (e instanceof PortletInvokerException)
          {
-            throw (PortletInvokerException)e;
+            throw(PortletInvokerException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/PortletInitializationException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCacheInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
+import org.apache.log4j.Logger;
+import org.jboss.portal.portlet.impl.jsr168.metadata.CacheConfigMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 import org.jboss.portal.portlet.info.CacheInfo;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.CacheConfigMetaData;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
-import org.apache.log4j.Logger;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.jboss.portal.Mode;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerMetaInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 import org.jboss.portal.portlet.info.MetaInfo;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.List;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.portlet.container.info;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPortletInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.jboss.portal.portlet.container.PortletApplicationImpl;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferenceInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
-import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.info.PreferenceInfo;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerPreferencesInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.common.value.StringValue;
 import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData;
 import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 
 import java.util.Collections;
 import java.util.HashMap;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSecurityInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
-import org.jboss.portal.portlet.info.SecurityInfo;
+import org.jboss.portal.portlet.TransportGuarantee;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.TransportGuaranteesMetaData;
-import org.jboss.portal.portlet.TransportGuarantee;
+import org.jboss.portal.portlet.info.SecurityInfo;
 
-import java.util.Set;
-import java.util.Iterator;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -50,7 +51,7 @@
       TransportGuaranteesMetaData tgMD = portletMD.getTransportGuarantees();
       if (tgMD != null)
       {
-         for (Iterator i = tgMD.iterator();i.hasNext();)
+         for (Iterator i = tgMD.iterator(); i.hasNext();)
          {
             TransportGuarantee tg = (TransportGuarantee)i.next();
             tgs.add(tg);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerSessionInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
+import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.info.SessionInfo;
-import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.portlet.container.info;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.jboss.portal.Mode;
@@ -44,13 +45,9 @@
  */
 public class ContentTypes
 {
-   /**
-    * Maps MIME Type (String) -> Modes (Set), excluding multiple MIME Types ("*", "* / *", "type / *").
-    */
+   /** Maps MIME Type (String) -> Modes (Set), excluding multiple MIME Types ("*", "* / *", "type / *"). */
    protected final Map singleTypeToPortletModes;
-   /**
-    * Maps MIME Type (String) -> Modes (Set), including multiple MIME Types ("*", "* / *", "type / *").
-    */
+   /** Maps MIME Type (String) -> Modes (Set), including multiple MIME Types ("*", "* / *", "type / *"). */
    protected final Map allTypeToPortletModes;
 
    protected final Set allModes;
@@ -190,17 +187,13 @@
       modes.add(mode);
    }
 
-   /**
-    * Return all modes.
-    */
+   /** Return all modes. */
    public Collection getAllModes()
    {
       return Collections.unmodifiableCollection(allModes);
    }
 
-   /**
-    * Return all content types.
-    */
+   /** Return all content types. */
    public Collection getAllContentTypes()
    {
       return Collections.unmodifiableCollection(allTypeToPortletModes.keySet());

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/InfoBundle.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
+import org.apache.log4j.Logger;
+import org.jboss.portal.portlet.impl.jsr168.APIConstants;
+import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListResourceBundle;
 import java.util.Locale;
 
-import org.apache.log4j.Logger;
-import org.jboss.portal.portlet.impl.jsr168.APIConstants;
-import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
-
 /**
  * A resource bundle that contains the inline information defined by the portlet specification.
  *

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/PortletResourceBundleManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.apache.log4j.Logger;
-import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
-import org.jboss.portal.common.util.ParentChildResourceBundle;
 import org.jboss.portal.common.util.EmptyResourceBundle;
 import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.common.util.ParentChildResourceBundle;
+import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
 
-import java.util.ResourceBundle;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Locale;
-import java.util.HashMap;
 import java.util.MissingResourceException;
-import java.util.Collection;
-import java.util.Iterator;
+import java.util.ResourceBundle;
 
 /**
  * Manage resource bundles for a portlet.
@@ -90,11 +91,11 @@
    }
 
    /**
-    * Return a localized value constructed from the various resource bundles. The supported locales of the
-    * manager are used in combination with the specified key. The default value is used if no value
-    * is found for the <code>Locale.ENGLISH</code>.
+    * Return a localized value constructed from the various resource bundles. The supported locales of the manager are
+    * used in combination with the specified key. The default value is used if no value is found for the
+    * <code>Locale.ENGLISH</code>.
     *
-    * @param key the key to lookup in the bundles
+    * @param key          the key to lookup in the bundles
     * @param defaultValue
     * @return the localized string
     * @throws IllegalArgumentException if the key of the default value is null
@@ -131,11 +132,11 @@
    }
 
    /**
-    * Return a bundle for the given locale. If the complete locale (language + country + variant) does not
-    * exist then it falls back to (language + country) or (language) or the default file.
+    * Return a bundle for the given locale. If the complete locale (language + country + variant) does not exist then it
+    * falls back to (language + country) or (language) or the default file.
     * <p/>
-    * When the resource bundle object is found and was not in the global map, it put it in that map
-    * with a copy on write.
+    * When the resource bundle object is found and was not in the global map, it put it in that map with a copy on
+    * write.
     *
     * @throws IllegalArgumentException if the locale is null
     */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/container/info/Utils.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.container.info;
 
 import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedStringMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.deployment;
 
 import org.jboss.portal.common.transaction.Transactions;
+import org.jboss.portal.portlet.container.info.ContainerCacheInfo;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
 import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
 import org.jboss.portal.portlet.metadata.PolicyPermissionMetaData;
 import org.jboss.portal.portlet.metadata.SecurityConstraintMetaData;
-import org.jboss.portal.portlet.container.info.ContainerCacheInfo;
 import org.jboss.portal.security.SecurityConstants;
 import org.jboss.xb.binding.GenericObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,52 +1,53 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.deployment;
 
-import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.xb.binding.GenericObjectModelFactory;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.util.LocaleInfo;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.portlet.TransportGuarantee;
 import org.jboss.portal.portlet.impl.jsr168.metadata.CacheConfigMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypeMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.DescriptionMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.DisplayNameMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.LanguagesMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityConstraintMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData;
+import org.jboss.portal.portlet.impl.jsr168.metadata.TransportGuaranteesMetaData;
 import org.jboss.portal.portlet.impl.jsr168.metadata.UserAttributeMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.DisplayNameMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.DescriptionMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.TransportGuaranteesMetaData;
-import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityConstraintMetaData;
-import org.jboss.portal.Mode;
-import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.common.util.LocaleInfo;
-import org.jboss.portal.common.util.Tools;
+import org.jboss.xb.binding.GenericObjectModelFactory;
+import org.jboss.xb.binding.UnmarshallingContext;
 import org.xml.sax.Attributes;
 
+import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
-import java.util.List;
-import java.util.Iterator;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -69,7 +70,7 @@
    {
       if (object instanceof DescribableObjectMetaData)
       {
-         if("description".equals(localName))
+         if ("description".equals(localName))
          {
             String lang = attrs.getValue("xml:lang");
             DescriptionMetaData value = new DescriptionMetaData();
@@ -83,7 +84,7 @@
       }
       if (object instanceof PortletApplicationMetaData)
       {
-         if("portlet".equals(localName))
+         if ("portlet".equals(localName))
          {
             return new PortletMetaData();
          }
@@ -118,7 +119,7 @@
          {
             return new PreferenceMetaData();
          }
-         else if("display-name".equals(localName))
+         else if ("display-name".equals(localName))
          {
             String lang = attrs.getValue("xml:lang");
             DisplayNameMetaData value = new DisplayNameMetaData();

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.deployment.jboss;
 
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.deployment.jboss;
 
-import org.jboss.portal.server.deployment.jboss.Deployment;
-import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
-import org.jboss.portal.server.deployment.PortalWebApp;
+import org.jboss.deployment.DeploymentException;
+import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
-import org.jboss.portal.server.config.ServerConfig;
+import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory;
 import org.jboss.portal.portlet.impl.jsr168.APIFactory;
 import org.jboss.portal.portlet.impl.jsr168.APIFactoryImpl;
-import org.jboss.portal.portlet.security.PortletSecurityService;
-import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory;
 import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
-import org.jboss.portal.common.util.Tools;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.portal.portlet.security.PortletSecurityService;
+import org.jboss.portal.server.config.ServerConfig;
+import org.jboss.portal.server.deployment.PortalWebApp;
+import org.jboss.portal.server.deployment.jboss.AbstractDeploymentFactory;
+import org.jboss.portal.server.deployment.jboss.Deployment;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
 
 import javax.management.MBeanServer;
+import java.io.InputStream;
 import java.net.URL;
-import java.util.regex.Pattern;
 import java.util.regex.Matcher;
-import java.io.InputStream;
+import java.util.regex.Pattern;
 
 /**
  * todo : remove unused ConfigService
@@ -207,9 +208,7 @@
       this.portletSecurityService = portletSecurityService;
    }
 
-   /**
-    * Subclasses can provide a subclass of JBossApplicationMetaDataFactory.
-    */
+   /** Subclasses can provide a subclass of JBossApplicationMetaDataFactory. */
    public JBossApplicationMetaDataFactory createJBossApplicationMetaDataFactory()
    {
       return new JBossApplicationMetaDataFactory();

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/deployment/jboss/ValueTrimmingFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.deployment.jboss;
 
 import org.jboss.xb.binding.GenericObjectModelFactory;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
-import org.jboss.portal.portlet.impl.jsr168.ActionRequestImpl;
-import org.jboss.portal.portlet.impl.jsr168.ActionResponseImpl;
-import org.jboss.portal.portlet.impl.jsr168.RenderRequestImpl;
-import org.jboss.portal.portlet.impl.jsr168.RenderResponseImpl;
 import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/APIFactoryImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.portlet.impl.jsr168.ActionRequestImpl;
-import org.jboss.portal.portlet.impl.jsr168.ActionResponseImpl;
 import org.jboss.portal.portlet.invocation.RenderInvocation;
 
 /**
@@ -36,14 +35,17 @@
    {
       return new ActionRequestImpl(invocation);
    }
+
    public ActionResponseImpl createActionResponse(ActionInvocation invocation, ActionRequestImpl actionRequest)
    {
       return new ActionResponseImpl(invocation, actionRequest);
    }
+
    public RenderRequestImpl createRenderRequest(RenderInvocation invocation)
    {
       return new RenderRequestImpl(invocation);
    }
+
    public RenderResponseImpl createRenderResponse(RenderInvocation invocation, RenderRequestImpl renderRequest)
    {
       return new RenderResponseImpl(invocation, renderRequest);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionRequestImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.portlet.Parameters;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.apache.log4j.Logger;
@@ -28,9 +29,9 @@
 import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.invocation.response.RedirectionResponse;
 import org.jboss.portal.portlet.invocation.response.RenderResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletMode;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletRequest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
+import javax.portlet.RenderRequest;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.Principal;
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
 
-import javax.portlet.RenderRequest;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -57,9 +57,9 @@
    private final Map attrs;
 
    public DispatchedHttpServletRequest(
-         RenderRequest rreq,
-         HttpServletRequest dreq,
-         String path)
+      RenderRequest rreq,
+      HttpServletRequest dreq,
+      String path)
    {
       this.rreq = rreq;
       this.dreq = dreq;
@@ -205,19 +205,23 @@
       {
          // The next element
          Object next;
+
          {
             next();
          }
+
          public boolean hasMoreElements()
          {
             return next != null;
          }
+
          public Object nextElement()
          {
             Object next = this.next;
             next();
             return next;
          }
+
          private void next()
          {
             next = null;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/DispatchedHttpServletResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
+import javax.portlet.RenderResponse;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.util.Locale;
 
-import javax.portlet.RenderResponse;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -103,14 +103,17 @@
          sos = new ServletOutputStream()
          {
             private OutputStream out = rresp.getPortletOutputStream();
+
             public void write(byte b[], int off, int len) throws IOException
             {
                out.write(b, off, len);
             }
+
             public void write(byte b[]) throws IOException
             {
                out.write(b);
             }
+
             public void write(int b) throws IOException
             {
                out.write(b);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.Mode;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletConfigImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
+import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-
-import org.jboss.portal.portlet.container.info.PortletResourceBundleManager;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -65,10 +65,7 @@
       return portletContext;
    }
 
-   /**
-    * May return null ? the spec does not specify what happens
-    * when the bundle is not found for the locale.
-    */
+   /** May return null ? the spec does not specify what happens when the bundle is not found for the locale. */
    public ResourceBundle getResourceBundle(Locale locale)
    {
       return bundleMgr.getResourceBundle(locale);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequestDispatcher;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Set;
 
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequestDispatcher;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletPreferencesImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,48 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
+import org.apache.log4j.Logger;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyContext;
+
+import javax.portlet.PortletPreferences;
+import javax.portlet.PreferencesValidator;
+import javax.portlet.ReadOnlyException;
+import javax.portlet.ValidatorException;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
 
-import javax.portlet.PortletPreferences;
-import javax.portlet.PreferencesValidator;
-import javax.portlet.ReadOnlyException;
-import javax.portlet.ValidatorException;
-
-import org.apache.log4j.Logger;
-import org.jboss.portal.common.value.StringValue;
-import org.jboss.portal.common.value.Value;
-import org.jboss.portal.portlet.state.PropertyContext;
-import org.jboss.portal.portlet.state.PropertyChange;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -72,9 +72,9 @@
    protected final Map updates;
 
    public PortletPreferencesImpl(
-         PropertyContext prefs,
-         PreferencesValidator validator,
-         int mode)
+      PropertyContext prefs,
+      PreferencesValidator validator,
+      int mode)
    {
       this.prefs = prefs;
       this.validator = validator;
@@ -266,7 +266,7 @@
          super(10);
 
          //
-         for (Iterator i = prefs.getPortletKeys().iterator();i.hasNext();)
+         for (Iterator i = prefs.getPortletKeys().iterator(); i.hasNext();)
          {
             String key = (String)i.next();
             String[] value = prefs.getPortletValue(key).asStringArray();
@@ -276,7 +276,7 @@
          }
 
          //
-         for (Iterator i = prefs.getKeys().iterator();i.hasNext();)
+         for (Iterator i = prefs.getKeys().iterator(); i.hasNext();)
          {
             String key = (String)i.next();
             String[] value = prefs.getValue(key).asStringArray();
@@ -310,7 +310,7 @@
          if (value instanceof String[])
          {
             String[] strings = (String[])value;
-            for (Iterator i = super.values().iterator();i.hasNext();)
+            for (Iterator i = super.values().iterator(); i.hasNext();)
             {
                String[] other = (String[])i.next();
                if (Arrays.equals(strings, other))
@@ -357,16 +357,12 @@
          return null;
       }
 
-      /**
-       * Do not change state.
-       */
+      /** Do not change state. */
       public void putAll(Map t)
       {
       }
 
-      /**
-       * Do not change state.
-       */
+      /** Do not change state. */
       public void clear()
       {
       }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
-import java.io.IOException;
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.server.servlet.FilterCommand;
 
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+import javax.servlet.FilterChain;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
-import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
-import org.jboss.portal.server.servlet.FilterCommand;
-import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
-import org.jboss.portal.portlet.impl.jsr168.DispatchedHttpServletRequest;
-import org.jboss.portal.portlet.impl.jsr168.DispatchedHttpServletResponse;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.apache.log4j.Logger;
@@ -58,8 +59,7 @@
 import java.util.Vector;
 
 /**
- * PortletRequest implemention. The parameter implementation is left
- * to subclasses that can implement it differently.
+ * PortletRequest implemention. The parameter implementation is left to subclasses that can implement it differently.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -243,7 +243,7 @@
       // one test in the TCK getPortalObjectContext the Enumeration then dispatch the call to a
       // servlet where it use the Enumeration and it throws a CME if we don't copy
       Set names = new HashSet();
-      for (Enumeration e = requestContext.getAttributeNames();e.hasMoreElements();)
+      for (Enumeration e = requestContext.getAttributeNames(); e.hasMoreElements();)
       {
          names.add(e.nextElement());
       }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletResponseImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.portlet.invocation.PortletInvocation;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletSessionImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
-import java.util.Enumeration;
-
 import javax.portlet.PortletContext;
 import javax.portlet.PortletSession;
 import javax.servlet.http.HttpSession;
+import java.util.Enumeration;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -75,15 +75,18 @@
       {
          private Enumeration e;
          private String next;
+
          {
             e = session.getAttributeNames();
             next = null;
             next();
          }
+
          public boolean hasMoreElements()
          {
             return next != null;
          }
+
          public Object nextElement()
          {
             String result = next;
@@ -91,6 +94,7 @@
             next();
             return result;
          }
+
          private void next()
          {
             while (e.hasMoreElements())
@@ -191,17 +195,13 @@
       return context;
    }
 
-   /**
-    * Return the underlying session.
-    */
+   /** Return the underlying session. */
    HttpSession getHttpSession()
    {
       return session;
    }
 
-   /**
-    * Detect validity of the session based on the underlying session. 
-    */
+   /** Detect validity of the session based on the underlying session. */
    boolean isValid()
    {
       try

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.Mode;
@@ -90,9 +91,7 @@
       }
    }
 
-   /**
-    * @exception IllegalArgumentException if the name is null
-    */
+   /** @throws IllegalArgumentException if the name is null */
    public void setParameter(String name, String value)
    {
       PortletUtils.checkRenderParameter(name, value);
@@ -175,9 +174,7 @@
          return parameters;
       }
 
-      /**
-       * The portlet container does not need to have the navigational state provided.
-       */
+      /** The portlet container does not need to have the navigational state provided. */
       public StateString getNavigationalState()
       {
          return null;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletUtils.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 
-import javax.portlet.PortletURL;
+import javax.portlet.PortletMode;
 import javax.portlet.PortletRequest;
+import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
-import javax.portlet.PortletMode;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -90,17 +91,13 @@
       }
    }
 
-   /**
-    * Creates an action URL.
-    */
+   /** Creates an action URL. */
    public static PortletURL createActionURL(PortletInvocation invocation, PortletRequest preq)
    {
       return new PortletURLImpl(invocation, preq, new PortletURLImpl.InternalActionURL());
    }
 
-   /**
-    * Creates an render URL.
-    */
+   /** Creates an render URL. */
    public static PortletURL createRenderURL(PortletInvocation invocation, PortletRequest preq)
    {
       return new PortletURLImpl(invocation, preq, new PortletURLImpl.InternalRenderURL());

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderRequestImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.portlet.ParametersStateString;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/RenderResponseImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168;
 
 import org.jboss.portal.common.MediaType;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/CacheConfigMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import org.jboss.portal.Mode;
 import org.jboss.portal.common.util.Tools;
 
+import java.util.HashSet;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import java.util.HashSet;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescribableObjectMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DescriptionMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/DisplayNameMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LanguagesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import java.util.LinkedList;
@@ -33,19 +34,13 @@
 public class LanguagesMetaData
 {
 
-   /**
-    * The unmodifiable list of the locales supported by the portlet.
-    */
+   /** The unmodifiable list of the locales supported by the portlet. */
    private List supportedLocales;
 
-   /**
-    * The path of the resource bundle or null if no is defined.
-    */
+   /** The path of the resource bundle or null if no is defined. */
    private String resourceBundle;
 
-   /**
-    * The inline info or null if not defined
-    */
+   /** The inline info or null if not defined */
    private InfoMetaData info;
 
    public LanguagesMetaData()
@@ -86,19 +81,13 @@
    public static class InfoMetaData
    {
 
-      /**
-       * The portlet title, cannot be null.
-       */
+      /** The portlet title, cannot be null. */
       private String title;
 
-      /**
-       * The portlet short title, can be null if not defined.
-       */
+      /** The portlet short title, can be null if not defined. */
       private String shortTitle;
 
-      /**
-       * The unparsed keywords, can be null if not defined.
-       */
+      /** The unparsed keywords, can be null if not defined. */
       private String keywords;
 
       public String getTitle()

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedStringMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/LocalizedValueMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import java.util.Locale;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ModesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import org.jboss.portal.common.metadata.MetaData;
 
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
-import java.util.Iterator;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ParameterMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletApplicationMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
-import javax.servlet.ServletContext;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -96,7 +96,7 @@
 
    public void addPortlet(PortletMetaData portlet)
    {
-      portlets.put(portlet.getName(),  portlet);
+      portlets.put(portlet.getName(), portlet);
    }
 
    public PortletMetaData getPortlet(String id)

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import org.jboss.portal.portlet.metadata.SessionConfigMetaData;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletModeMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
-import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData;
-
 import javax.portlet.PortletMode;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PortletPreferencesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/PreferenceMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 public class PreferenceMetaData

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityConstraintMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import org.jboss.portal.portlet.TransportGuarantee;
 
+import java.util.HashSet;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/SecurityRoleRefMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import org.jboss.portal.common.util.LocalizedString;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/TransportGuaranteesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
 import org.jboss.portal.portlet.TransportGuarantee;
 
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/UserAttributeMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
-import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStateMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
-import org.jboss.portal.portlet.impl.jsr168.metadata.DescribableObjectMetaData;
-
 import javax.portlet.WindowState;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/WindowStatesMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.metadata;
 
+import org.jboss.portal.common.metadata.MetaData;
+
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Set;
-import java.util.Iterator;
 
-import org.jboss.portal.common.metadata.MetaData;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/ActionURLTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
 /**
  * The actionURL tag for the JSR 168 Portlet specification.
- * 
- * Creates a URL that must point to the current portlet and must trigger
- * an action request with the supplied parameters. 
+ * <p/>
+ * Creates a URL that must point to the current portlet and must trigger an action request with the supplied
+ * parameters.
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- * 
- * @jsp.tag name="actionURL"
- * 				body-content="JSP"
- * 				tei-class="org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI"
- * 
+ * @jsp.tag name="actionURL" body-content="JSP" tei-class="org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI"
  */
 public class ActionURLTag extends GenerateURLTag
 {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
 import javax.portlet.PortletConfig;
@@ -31,10 +32,7 @@
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- * 
- * @jsp.tag name="defineObjects"
- *          body-content="empty"
- * 			tei-class="org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI"
+ * @jsp.tag name="defineObjects" body-content="empty" tei-class="org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI"
  */
 public class DefineObjectsTag extends PortletTag
 {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
 import javax.portlet.PortletConfig;
@@ -29,8 +30,7 @@
 import javax.servlet.jsp.tagext.VariableInfo;
 
 /**
- * The additional variable definitions for the
- * defineObjects tag for the JSR 168 Portlet specification.
+ * The additional variable definitions for the defineObjects tag for the JSR 168 Portlet specification.
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
@@ -44,11 +44,11 @@
    public VariableInfo[] getVariableInfo(TagData data)
    {
       VariableInfo info1 = new VariableInfo(portletConfigVariableName,
-            PortletConfig.class.getName(), true, VariableInfo.AT_END);
+         PortletConfig.class.getName(), true, VariableInfo.AT_END);
       VariableInfo info2 = new VariableInfo(renderRequestVariableName,
-            RenderRequest.class.getName(), true, VariableInfo.AT_END);
+         RenderRequest.class.getName(), true, VariableInfo.AT_END);
       VariableInfo info3 = new VariableInfo(renderResponseVariableName,
-            RenderResponse.class.getName(), true, VariableInfo.AT_END);
+         RenderResponse.class.getName(), true, VariableInfo.AT_END);
       VariableInfo[] info = {info1, info2, info3};
       return info;
    }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,53 +1,51 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
 
 import javax.portlet.PortletMode;
 import javax.portlet.PortletModeException;
 import javax.portlet.PortletSecurityException;
 import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
-import javax.portlet.RenderRequest;
 import javax.servlet.jsp.JspException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
-import org.jboss.portal.portlet.impl.jsr168.PortletUtils;
-
 /**
- * Superclass of the actionURL and renderURL tags for the JSR 168
- * Portlet specification.
+ * Superclass of the actionURL and renderURL tags for the JSR 168 Portlet specification.
+ * <p/>
+ * Creates a URL that must point to the current portlet and must trigger a render or action request with the supplied
+ * parameters.
  *
- * Creates a URL that must point to the current portlet and must trigger
- * a render or action request with the supplied parameters.
- *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- *
  */
 abstract class GenerateURLTag extends PortletTag
 {
@@ -58,54 +56,43 @@
    private Map parameters = new HashMap(5);
 
    /**
-    * Indicates the portlet mode that the portlet must have when this
-    * link is executed.
-    *
+    * Indicates the portlet mode that the portlet must have when this link is executed.
+    * <p/>
     * Predefined states: edit, view, help
+    * <p/>
+    * Optional. Defaults to same as the portlet mode for the current request, by not being included as a parameter in
+    * the URL.
     *
-    * Optional. Defaults to same as the portlet mode for the current
-    * request, by not being included as a parameter in the URL.
-    *
     * @return Returns the portletMode.
-    *
-    * @jsp.attribute
-    * 		rtexprvalue="true"
+    * @jsp.attribute rtexprvalue="true"
     */
    public String getPortletMode()
    {
       return portletMode;
    }
 
-   /**
-    * @param portletMode The portletMode to set.
-    */
+   /** @param portletMode The portletMode to set. */
    public void setPortletMode(String portletMode)
    {
       this.portletMode = portletMode;
    }
 
    /**
-    * Indicates whether the resulting URL should be a secure or insecure
-    * connection.
-    *
+    * Indicates whether the resulting URL should be a secure or insecure connection.
+    * <p/>
     * "true" or "false"
+    * <p/>
+    * Optional.  Defaults to security setting for the current request, by not being included as a parameter in the URL.
     *
-    * Optional.  Defaults to security setting for the current
-    * request, by not being included as a parameter in the URL.
-    *
     * @return Returns the secure connection value.
-    *
-    * @jsp.attribute
-    * 		rtexprvalue="true"
+    * @jsp.attribute rtexprvalue="true"
     */
    public String getSecure()
    {
       return secure;
    }
 
-   /**
-    * @param secure The secure connection value to set.
-    */
+   /** @param secure The secure connection value to set. */
    public void setSecure(String secure)
    {
       this.secure = secure;
@@ -113,53 +100,43 @@
 
    /**
     * @return Returns the var - name of the exported scope variable.
-    *
-    * @jsp.attribute
-    * 		rtexprvalue="true"
+    * @jsp.attribute rtexprvalue="true"
     */
    public String getVar()
    {
       return var;
    }
 
-   /**
-    * @param var The var to set.
-    */
+   /** @param var The var to set. */
    public void setVar(String var)
    {
       this.var = var;
    }
 
    /**
-    * Indicates the window state that the portlet should have when this
-    * link is executed.
-    *
+    * Indicates the window state that the portlet should have when this link is executed.
+    * <p/>
     * Predefined states: minimized, maximized, normal
+    * <p/>
+    * Optional. Defaults to same as the window state for the current request, by not being included as a parameter in
+    * the URL.
     *
-    * Optional. Defaults to same as the window state for the current
-    * request, by not being included as a parameter in the URL.
-    *
     * @return Returns the windowState.
-    *
-    * @jsp.attribute
-    * 		rtexprvalue="true"
+    * @jsp.attribute rtexprvalue="true"
     */
    public String getWindowState()
    {
       return windowState;
    }
 
-   /**
-    * @param windowState The windowState to set.
-    */
+   /** @param windowState The windowState to set. */
    public void setWindowState(String windowState)
    {
       this.windowState = windowState;
    }
 
    /**
-    * Convert working parameters to what is needed by
-    * PortletURL - a map with String[] values.
+    * Convert working parameters to what is needed by PortletURL - a map with String[] values.
     *
     * @return Returns the parameters.
     */
@@ -178,8 +155,7 @@
    }
 
    /**
-    * Add a named parameter. Cater for multiple parameters with the same name
-    * by storing them in a list.
+    * Add a named parameter. Cater for multiple parameters with the same name by storing them in a list.
     *
     * @param name
     * @param value
@@ -203,9 +179,8 @@
    }
 
    /**
-    * Set up the environment for generating the PortletURL and
-    * get the base PortletURL to decorate. Includes setting the "type"
-    * parameter from the implementing subclass.
+    * Set up the environment for generating the PortletURL and get the base PortletURL to decorate. Includes setting the
+    * "type" parameter from the implementing subclass.
     *
     * @return The PortelURL to decorate
     */
@@ -229,8 +204,8 @@
    }
 
    /**
-    * Set the window state for the URL to be what was given in the tag.
-    * If not given, default to what was there previously
+    * Set the window state for the URL to be what was given in the tag. If not given, default to what was there
+    * previously
     *
     * @param portletURL
     * @throws WindowStateException
@@ -244,8 +219,8 @@
    }
 
    /**
-    * Set the portlet mode for the URL to be what was given in the tag.
-    * If not given, default to what was there previously
+    * Set the portlet mode for the URL to be what was given in the tag. If not given, default to what was there
+    * previously
     *
     * @param portletURL
     * @throws PortletModeException
@@ -259,8 +234,8 @@
    }
 
    /**
-    * Set the secure/unsecure state for the URL to be what was given in the tag.
-    * If not given, default to what was there previously
+    * Set the secure/unsecure state for the URL to be what was given in the tag. If not given, default to what was there
+    * previously
     *
     * @param portletURL
     * @throws PortletSecurityException
@@ -292,18 +267,14 @@
     */
    protected abstract String getTypeValue();
 
-   /**
-    * Process the body, which may contain portlet:param tags
-    */
+   /** Process the body, which may contain portlet:param tags */
    public int doStartTag() throws JspException
    {
       clearPreviousTag();
       return EVAL_BODY_INCLUDE;
    }
 
-   /**
-    * Generate the URL
-    */
+   /** Generate the URL */
    public int doEndTag() throws JspException
    {
       String resultingURL = null;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/GenerateURLTagTEI.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
 import javax.servlet.jsp.tagext.TagData;
@@ -26,8 +27,7 @@
 import javax.servlet.jsp.tagext.VariableInfo;
 
 /**
- * The additional variable definitions for the
- * actionURL tag for the JSR 168 Portlet specification.
+ * The additional variable definitions for the actionURL tag for the JSR 168 Portlet specification.
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
@@ -38,8 +38,8 @@
    public boolean isValid(TagData data)
    {
       return isWindowStateValid(data) &&
-            isPortletModeValid(data) &&
-            isSecureValid(data);
+         isPortletModeValid(data) &&
+         isSecureValid(data);
    }
 
    public boolean isWindowStateValid(TagData data)
@@ -59,10 +59,14 @@
       {
          String s = (String)o;
          if (s.toLowerCase().equals("true") ||
-               s.toLowerCase().equals("false"))
+            s.toLowerCase().equals("false"))
+         {
             return true;
+         }
          else
+         {
             return false;
+         }
       }
       else
       {
@@ -79,10 +83,10 @@
       }
 
       VariableInfo info1
-            = new VariableInfo(varName,
-                  "String",
-                  true,
-                  VariableInfo.AT_END);
+         = new VariableInfo(varName,
+         "String",
+         true,
+         VariableInfo.AT_END);
       VariableInfo[] info = {info1};
       return info;
    }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/NamespaceTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
+import javax.portlet.RenderResponse;
+import javax.servlet.jsp.JspException;
 import java.io.IOException;
 
-import javax.servlet.jsp.JspException;
-import javax.portlet.RenderResponse;
-
 /**
  * The namespace tag for the JSR 168 Portlet specification.
- *
+ * <p/>
  * This tag produces a unique value for the current portlet.
+ * <p/>
+ * This tag should be used for named elements in the portlet output (such as Javascript functions and variables). The
+ * namespacing ensures that the given name is uniquely associated with this portlet and avoids name conflicts with other
+ * elements on the portal page or with other portlets on the page.
  *
- * This tag should be used for named elements in the portlet output
- * (such as Javascript functions and variables). The namespacing
- * ensures that the given name is uniquely associated with this
- * portlet and avoids name conflicts with other elements on the portal
- * page or with other portlets on the page.
- *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- *
- * @jsp.tag name="namespace"
- * 				body-content="empty"
- *
+ * @jsp.tag name="namespace" body-content="empty"
  */
 public class NamespaceTag extends PortletTag
 {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,44 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
+import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.tagext.TagSupport;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.PortletConfig;
 
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor;
-
 /**
- * Superclass of the portlet tags for the JSR 168
- * Portlet specification.
- * 
- * Provides hooks into the portlet environment  
+ * Superclass of the portlet tags for the JSR 168 Portlet specification.
+ * <p/>
+ * Provides hooks into the portlet environment
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- * 
  */
 public class PortletTag extends TagSupport
 {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/RenderURLTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
 /**
  * The renderURL tag for the JSR 168 Portlet specification.
- * 
- * Creates a URL that must point to the current portlet and must trigger
- * an render request with the supplied parameters. 
+ * <p/>
+ * Creates a URL that must point to the current portlet and must trigger an render request with the supplied
+ * parameters.
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- * 
- * @jsp.tag name="renderURL"
- * 				body-content="JSP"
- * 				tei-class="org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI"
- * 
+ * @jsp.tag name="renderURL" body-content="JSP" tei-class="org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTagTEI"
  */
 public class RenderURLTag extends GenerateURLTag
 {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/URLParameterTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
 /**
- * The additional parameters definitions for the
- * actionURL and renderURL tags for the JSR 168 Portlet specification.
+ * The additional parameters definitions for the actionURL and renderURL tags for the JSR 168 Portlet specification.
  *
  * @author <a href="mailto:sgwood at ix.netcom.com">Sherman Wood</a>
  * @version $Revision$
- * 
- * @jsp.tag name="param"
- * 				body-content="empty"
+ * @jsp.tag name="param" body-content="empty"
  */
 public class URLParameterTag extends TagSupport
 {
@@ -43,23 +41,18 @@
 
    /**
     * The name of the parameter to add to the URL.
-    *
+    * <p/>
     * If null or empty, no action is performed.
     *
     * @return Returns the name.
-    *
-    * @jsp.attribute
-    * 		required="true"
-    * 		rtexprvalue="true"
+    * @jsp.attribute required="true" rtexprvalue="true"
     */
    public String getName()
    {
       return name;
    }
 
-   /**
-    * @param name The name to set.
-    */
+   /** @param name The name to set. */
    public void setName(String name)
    {
       this.name = name;
@@ -67,23 +60,18 @@
 
    /**
     * The value of the parameter to add to the URL.
-    *
+    * <p/>
     * If null, it is processed as an empty value.
     *
     * @return Returns the value.
-    *
-    * @jsp.attribute
-    * 		required="true"
-    * 		rtexprvalue="true"
+    * @jsp.attribute required="true" rtexprvalue="true"
     */
    public String getValue()
    {
       return value;
    }
 
-   /**
-    * @param value The value to set.
-    */
+   /** @param value The value to set. */
    public void setValue(String value)
    {
       this.value = value;
@@ -109,7 +97,7 @@
       try
       {
          GenerateURLTag ancestorTag =
-               (GenerateURLTag)findAncestorWithClass(this, GenerateURLTag.class);
+            (GenerateURLTag)findAncestorWithClass(this, GenerateURLTag.class);
 
          Parameter p = new Parameter(getName(), getValue());
 
@@ -137,9 +125,7 @@
       private String name;
       private String value;
 
-      /**
-       * @return Returns the name.
-       */
+      /** @return Returns the name. */
       public String getName()
       {
          return name;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/security/JBossPortletSecurityService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*
  * JBoss, the OpenSource J2EE webOS
  *
@@ -3,34 +26,34 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
- */ 
+ */
 package org.jboss.portal.portlet.impl.security;
 
-import java.util.Collection;
-import java.util.Iterator; 
-import java.util.Set;
-
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.security.PortletPermission;
 import org.jboss.portal.portlet.security.PortletSecurityService;
-import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistry;
 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.RoleSecurityBinding;
+import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistry;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 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.jems.as.system.AbstractJBossService;
+import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
- *  Service that configures security for portlets
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Mar 17, 2006
+ * Service that configures security for portlets
+ *
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @version $Revision$
+ * @since Mar 17, 2006
  */
 public class JBossPortletSecurityService extends AbstractJBossService
@@ -41,7 +64,7 @@
 
    /** . */
    protected ConcurrentReaderHashMap securityConstraintsMap;
-   
+
    /** . */
    protected PortalAuthorizationManagerFactory portalAuthorizationManagerFactory;
 
@@ -52,12 +75,12 @@
    {
       return this;
    }
-   
+
    //*************************************************************
    //   AuthorizationDomain Interface Methods
    //*************************************************************
    public String getType()
-   { 
+   {
       return PortletPermission.PERMISSION_TYPE;
    }
 
@@ -80,19 +103,19 @@
    {
       return (Set)securityConstraintsMap.get(uri);
    }
-   
+
    public void setSecurityBindings(String uri, Set securityBindings) throws SecurityConfigurationException
-   { 
+   {
       this.securityConstraintsMap.put(uri, securityBindings);
    }
 
    public void removeSecurityBindings(String uri) throws SecurityConfigurationException
-   { 
+   {
       this.securityConstraintsMap.remove(uri);
    }
 
    public PortalPermission getPermission(String roleName, String uri) throws PortalSecurityException
-   { 
+   {
       Set set = getSecurityBindings(uri);
       if (set != null && !set.isEmpty())
       {
@@ -100,42 +123,42 @@
          {
             RoleSecurityBinding sc = (RoleSecurityBinding)i.next();
             String constraintRoleName = sc.getRoleName();
-            if (constraintRoleName.equals(roleName) || 
-                  SecurityConstants.UNCHECKED_ROLE_NAME.equals(constraintRoleName))
+            if (constraintRoleName.equals(roleName) ||
+               SecurityConstants.UNCHECKED_ROLE_NAME.equals(constraintRoleName))
             {
                return createPermission(uri, sc.getActions());
             }
          }
       }
       return null;
-   } 
+   }
 
    public PortalPermission createPermissionContainer(PortalPermissionCollection collection) throws PortalSecurityException
-   { 
+   {
       return new PortletPermission(collection);
    }
 
    public PortalPermission createPermission(String uri, String action) throws PortalSecurityException
-   { 
-      return new PortletPermission(uri,action);
+   {
+      return new PortletPermission(uri, action);
    }
 
    public PortalPermission createPermission(String uri, Collection actions) throws PortalSecurityException
-   { 
-      return new PortletPermission(uri,actions);
+   {
+      return new PortletPermission(uri, actions);
    }
- 
+
    protected void createService() throws Exception
    {
       super.createService();
       this.securityConstraintsMap = new ConcurrentReaderHashMap();
    }
- 
+
    protected void destroyService() throws Exception
    {
       super.destroyService();
    }
- 
+
    protected void startService() throws Exception
    {
       super.startService();
@@ -143,7 +166,7 @@
       // Add ourself as the authorization domain
       authorizationDomainRegistry.addDomain(this);
    }
-   
+
    protected void stopService() throws Exception
    {
       authorizationDomainRegistry.removeDomain(this);
@@ -171,4 +194,4 @@
    {
       this.portalAuthorizationManagerFactory = portalAuthorizationManagerFactory;
    }
- }
+}

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortletInvocationContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.spi;
 
+import org.jboss.portal.common.invocation.AbstractInvocationContext;
 import org.jboss.portal.common.util.URLTools;
-import org.jboss.portal.common.invocation.AbstractInvocationContext;
 import org.jboss.portal.portlet.spi.PortletInvocationContext;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractRequestContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.spi;
 
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.portlet.spi.RequestContext;
-import org.jboss.portal.portlet.Properties;
-import org.jboss.portal.common.util.Tools;
 
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import java.util.Set;
+import java.io.IOException;
+import java.util.Enumeration;
 import java.util.HashSet;
-import java.util.Enumeration;
 import java.util.List;
-import java.io.IOException;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractSecurityContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.spi;
 
 import org.jboss.portal.portlet.spi.SecurityContext;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.state;
 
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.state.StateConverter;
 import org.jboss.portal.portlet.state.producer.ProducerState;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.common.util.Tools;
 
 import java.io.IOException;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterV0.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterV0.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateConverterV0.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,50 +1,51 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.state;
 
-import org.jboss.portal.portlet.state.StateConverter;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.portlet.state.SimplePropertyMap;
 import org.jboss.portal.portlet.state.StateConversionException;
+import org.jboss.portal.portlet.state.StateConverter;
 import org.jboss.portal.portlet.state.producer.ProducerState;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.common.value.StringValue;
 
-import java.io.DataOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
-import java.io.ByteArrayInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 
 /**
- * <p>An implementation that relies on the <code>DataInputStream</code> and <code>DataOutputStream</code> to
- * marshall and unmarshall the producer state. The marshalled value starts with a magic value and a version id
- * to ensure future backward compatibility.</p>
+ * <p>An implementation that relies on the <code>DataInputStream</code> and <code>DataOutputStream</code> to marshall
+ * and unmarshall the producer state. The marshalled value starts with a magic value and a version id to ensure future
+ * backward compatibility.</p>
+ * <p/>
+ * <p>It is an important matter because a migrated producer will probably have to take care of consumers that hold a
+ * previous version of the producer state.</p>
  *
- * <p>It is an important matter because a migrated producer will probably
- * have to take care of consumers that hold a previous version of the producer state.</p>
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
  */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateManagementPolicyService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateManagementPolicyService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/StateManagementPolicyService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.state;
 
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.state.StateManagementPolicy;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.state.consumer;
 
+import org.jboss.portal.portlet.state.InvalidStateIdException;
+import org.jboss.portal.portlet.state.NoSuchStateException;
 import org.jboss.portal.portlet.state.consumer.ConsumerPersistenceManager;
 import org.jboss.portal.portlet.state.consumer.ConsumerState;
 import org.jboss.portal.portlet.state.consumer.ConsumerStateContext;
-import org.jboss.portal.portlet.state.NoSuchStateException;
-import org.jboss.portal.portlet.state.InvalidStateIdException;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/producer/ProducerPersistenceManagerService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/producer/ProducerPersistenceManagerService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/impl/state/producer/ProducerPersistenceManagerService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.impl.state.producer;
 
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.InvalidStateIdException;
+import org.jboss.portal.portlet.state.NoSuchStateException;
+import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.portlet.state.SimplePropertyMap;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.InvalidStateIdException;
 import org.jboss.portal.portlet.state.producer.ProducerPersistenceManager;
 import org.jboss.portal.portlet.state.producer.ProducerStateContext;
-import org.jboss.portal.portlet.state.NoSuchStateException;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -132,6 +133,6 @@
 
    public synchronized int getSize()
    {
-      return store.size(); 
+      return store.size();
    }
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/CacheInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 /**
@@ -28,8 +29,6 @@
 public interface CacheInfo
 {
 
-   /**
-    * The expiration in seconds.
-    */
+   /** The expiration in seconds. */
    int getExpirationSecs();
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/CapabilitiesInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import java.util.Set;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/MetaInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import org.jboss.portal.common.util.LocalizedString;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/ModeInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import org.jboss.portal.Mode;
@@ -31,14 +32,10 @@
  */
 public interface ModeInfo
 {
-   /**
-    * The mode description.
-    */
+   /** The mode description. */
    LocalizedString getDescription();
 
-   /**
-    * The mode value.
-    */
+   /** The mode value. */
    Mode getMode();
 
    /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/PortletInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 /**
@@ -38,8 +39,8 @@
    CapabilitiesInfo getCapabilities();
 
    /**
-    * Retrieves information about the preferences supported by the described portlet, it
-    * must return null if the portlet cannot be personalized.
+    * Retrieves information about the preferences supported by the described portlet, it must return null if the portlet
+    * cannot be personalized.
     *
     * @return the preferences meta data of the portlet
     */
@@ -67,8 +68,8 @@
    CacheInfo getCache();
 
    /**
-    * Retrieves session-related information for the described portlet. If no information is
-    * available then it returns the null value.
+    * Retrieves session-related information for the described portlet. If no information is available then it returns
+    * the null value.
     *
     * @return the session related information
     */
@@ -76,11 +77,11 @@
 
    /**
     * Determines whether the described portlet can be accessed remotely (such as via WSRP) or not. Clients of this
-    * method should be prepare to handle a <code>null</code> return value expressing the fact that the remotable
-    * status hasn't been explicitely set.
+    * method should be prepare to handle a <code>null</code> return value expressing the fact that the remotable status
+    * hasn't been explicitely set.
     *
-    * @return <code>Boolean.TRUE</code> if the described portlet can be accessed remotely, <code>Boolean.FALSE</code>
-    *         if the described portlet cannot be accessed remotely, <code>null</code> if the value hasn't been specified
+    * @return <code>Boolean.TRUE</code> if the described portlet can be accessed remotely, <code>Boolean.FALSE</code> if
+    *         the described portlet cannot be accessed remotely, <code>null</code> if the value hasn't been specified
     *         explicitely for the associated portlet.
     */
    Boolean isRemotable();

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferenceInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import org.jboss.portal.common.util.LocalizedString;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/PreferencesInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import java.util.Set;
@@ -30,16 +31,14 @@
  */
 public interface PreferencesInfo
 {
-   /**
-    * Return the immutable set of keys.
-    */
+   /** Return the immutable set of keys. */
    Set getKeys();
 
    /**
     * A preference specified by its key.
     *
-    * @throws IllegalArgumentException if the key is null
     * @return the preference info or null if it does not exist
+    * @throws IllegalArgumentException if the key is null
     */
    PreferenceInfo getPreference(String key) throws IllegalArgumentException;
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/SecurityInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import org.jboss.portal.portlet.TransportGuarantee;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/SessionInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/info/WindowStateInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.info;
 
 import org.jboss.portal.WindowState;
@@ -31,14 +32,10 @@
  */
 public interface WindowStateInfo
 {
-   /**
-    * The window state description.
-    */
+   /** The window state description. */
    LocalizedString getDescription();
 
-   /**
-    * The window state value.
-    */
+   /** The window state value. */
    WindowState getWindowState();
 
    /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/ActionInvocation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation;
 
 import org.jboss.portal.portlet.spi.ActionContext;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation;
 
 import org.jboss.portal.common.invocation.Invocation;
 import org.jboss.portal.common.invocation.InvocationException;
 import org.jboss.portal.server.impl.invocation.JBossInterceptor;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/PortletInvocation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation;
 
 import org.jboss.portal.common.invocation.Invocation;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/RenderInvocation.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/RenderInvocation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/RenderInvocation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation;
 
 import org.jboss.portal.portlet.spi.RenderContext;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/AccessDeniedResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/AccessDeniedResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/AccessDeniedResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/ErrorResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/ErrorResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/ErrorResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 import org.jboss.logging.Logger;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/FragmentResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/FragmentResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/FragmentResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 import org.jboss.portal.portlet.Properties;
@@ -177,10 +178,8 @@
       this.contentType = contentType;
    }
 
-   /**
-    * @throws IllegalStateException if the output stream is already used or if no content type is defined
-    */
-   public PrintWriter getWriter()throws IllegalStateException
+   /** @throws IllegalStateException if the output stream is already used or if no content type is defined */
+   public PrintWriter getWriter() throws IllegalStateException
    {
       if (bytes != null)
       {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/HTTPRedirectionResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientPrivilegesResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/InsufficientTransportGuaranteeResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/PortletInvocationResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RedirectionResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RenderResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RenderResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/RenderResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
 
 /**
  * Want to be rendered.

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/SecurityErrorResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
-import org.jboss.portal.portlet.invocation.response.ErrorResponse;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/StreamResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/StreamResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/StreamResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-
 /**
  * Stream a result to the client directly.
  *

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/UnavailableResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/SoftTimedContent.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/SoftTimedContent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/SoftTimedContent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response.cache;
 
-import java.lang.ref.WeakReference;
-
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 
+import java.lang.ref.WeakReference;
+
 /**
  * Use soft reference.
  *
@@ -36,13 +37,11 @@
 
    /** The serialVersionUID */
    private static final long serialVersionUID = -8166044526732362286L;
-   
+
    /** The content. */
    private transient WeakReference content;
 
-   /**
-    * @exception IllegalArgumentException if the content is null
-    */
+   /** @throws IllegalArgumentException if the content is null */
    public SoftTimedContent(FragmentResponse content, long expirationTimeMillis) throws IllegalArgumentException
    {
       super(expirationTimeMillis);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/StrongTimedContent.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/StrongTimedContent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/StrongTimedContent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response.cache;
 
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -37,9 +38,7 @@
    /** The content. */
    private transient FragmentResponse content;
 
-   /**
-    * @exception IllegalArgumentException if the content is null
-    */
+   /** @throws IllegalArgumentException if the content is null */
    public StrongTimedContent(FragmentResponse content, long expirationTimeMillis) throws IllegalArgumentException
    {
       super(expirationTimeMillis);

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/TimedContent.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/TimedContent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/invocation/response/cache/TimedContent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.invocation.response.cache;
 
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -42,9 +43,7 @@
       this.expirationTimeMillis = expirationTimeMillis;
    }
 
-   /**
-    * Return the content, possibly null. 
-    */
+   /** Return the content, possibly null. */
    public abstract FragmentResponse getContent();
 
    /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.metadata;
 
 import java.util.LinkedHashMap;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.metadata;
 
 import org.jboss.portal.common.transaction.Transactions;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.metadata;
 
+import java.util.HashSet;
 import java.util.Set;
-import java.util.HashSet;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.metadata;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.LinkedHashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.metadata;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletPermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.security;
 
 import org.jboss.portal.security.PortalPermission;
@@ -28,9 +29,9 @@
 
 import javax.security.auth.Subject;
 import java.security.Permission;
-import java.util.StringTokenizer;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.StringTokenizer;
 
 /**
  * The permission for instance.
@@ -39,7 +40,7 @@
  * @version $Revision$
  */
 public final class PortletPermission extends PortalPermission
-{  
+{
 
    /** The serialVersionUID */
    private static final long serialVersionUID = 8445291296726152562L;
@@ -88,7 +89,7 @@
    public PortletPermission(String uri, Collection actions)
    {
       super("portletpermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }
@@ -104,7 +105,7 @@
    public PortletPermission(String uri, String actions)
    {
       super("portletpermission", uri);
-      if (actions ==  null)
+      if (actions == null)
       {
          throw new IllegalArgumentException("Actions agurment cannot be null");
       }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/security/PortletSecurityService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*
  * JBoss, the OpenSource J2EE webOS
  *
@@ -3,18 +26,18 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
- */ 
+ */
 package org.jboss.portal.portlet.security;
 
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 
 /**
- *  Interface that defines a service that is used to configure
- *  security for portlets
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Mar 17, 2006
+ * Interface that defines a service that is used to configure security for portlets
+ *
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @version $Revision$
+ * @since Mar 17, 2006
  */
 public interface PortletSecurityService
 {
-   AuthorizationDomain getAuthorizationDomain(); 
+   AuthorizationDomain getAuthorizationDomain();
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/session/AttributeModification.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.session;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/session/Modification.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/session/Modification.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/session/Modification.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.session;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionListener.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.session;
 
 import org.jboss.logging.Logger;
@@ -29,8 +30,8 @@
 import javax.servlet.http.HttpSessionBindingEvent;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Listener for various session events that modifies the subsession associated with the current thread of execution.
@@ -148,10 +149,7 @@
       }
    }
 
-   /**
-    *
-    * @throws IllegalStateException
-    */
+   /** @throws IllegalStateException  */
    public static void activate() throws IllegalStateException
    {
       if (local.get() != null)

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/session/SessionModification.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.session;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/session/SubSession.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.session;
 
+import org.jboss.invocation.MarshalledValue;
 import org.jboss.logging.Logger;
-import org.jboss.invocation.MarshalledValue;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -30,14 +31,14 @@
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.List;
-import java.util.Enumeration;
-import java.util.ArrayList;
 
 /**
  * A subsession keep tracks of the content of a given portlet session.

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/ActionContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
+import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.Parameters;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/InstanceContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
+import org.jboss.portal.portlet.StateEvent;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.StateEvent;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -33,7 +34,7 @@
    /**
     * Return an id that can differenciate instances.
     *
-    * @return the instance id 
+    * @return the instance id
     */
    String getId();
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortalContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
 import java.util.Map;
@@ -32,18 +33,12 @@
  */
 public interface PortalContext
 {
-   /**
-    * Return the window states accepted by this portal context.
-    */
+   /** Return the window states accepted by this portal context. */
    Set getWindowStates();
 
-   /**
-    * Return the modes accepted by this portal context.
-    */
+   /** Return the modes accepted by this portal context. */
    Set getModes();
 
-   /**
-    * Return the set of properties of this portal context.
-    */
+   /** Return the set of properties of this portal context. */
    Map getProperties();
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/PortletInvocationContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.invocation.InvocationContext;
+import org.jboss.portal.portlet.PortletURL;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletURL;
 import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
-import org.jboss.portal.common.invocation.InvocationContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -63,23 +64,22 @@
    HTTPStreamInfo getStreamInfo();
 
    /**
-    * <p>Encodes the specified URL by including the session ID in it, or, if encoding is not needed, returns the URL unchanged.
-    * The implementation of this method includes the logic to determine whether the session ID needs to be encoded in the URL.
-    * For example, if the browser supports cookies, or session tracking is turned off, URL encoding is unnecessary.</p>
-    *
+    * <p>Encodes the specified URL by including the session ID in it, or, if encoding is not needed, returns the URL
+    * unchanged. The implementation of this method includes the logic to determine whether the session ID needs to be
+    * encoded in the URL. For example, if the browser supports cookies, or session tracking is turned off, URL encoding
+    * is unnecessary.</p>
+    * <p/>
     * <p>For robust session tracking, all URLs emitted by a servlet should be run through this method. Otherwise, URL
     * rewriting cannot be used with browsers which do not support cookies.</p>
     *
     * @param url the url to be encoded
     * @return the encoded URL if encoding is needed, the unchanged URL otherwise
     * @throws IllegalArgumentException if the url is not valid or null
-    *
     */
    String encodeURL(String url) throws IllegalArgumentException;
 
    /**
-    *
-    * @param portletURL the portlet url
+    * @param portletURL        the portlet url
     * @param wantSecure
     * @param wantAuthenticated
     * @param relative

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/RenderContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/RequestContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
+import java.io.IOException;
+import java.util.Enumeration;
 import java.util.Set;
-import java.util.Enumeration;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/SecurityContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
 import java.security.Principal;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/UserContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
 import java.util.List;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/spi/WindowContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.spi;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.PreferenceInfo;
-import org.jboss.portal.common.value.Value;
 
+import java.util.Collections;
 import java.util.Set;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -57,10 +58,9 @@
    private int status;
 
    /**
-    * Create a new object. If the userPrefs argument is null then the object is considered
-    * as globally read only.
+    * Create a new object. If the userPrefs argument is null then the object is considered as globally read only.
     *
-    * @param userPrefs the user prefs
+    * @param userPrefs    the user prefs
     * @param portletPrefs the portlet prefs
     * @throws IllegalArgumentException if the portletPrefs are null
     */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/AbstractPropertyMap.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 import org.jboss.portal.common.util.TypedMap;
@@ -38,7 +39,7 @@
     * Only accept non null string objects.
     *
     * @throws NullPointerException if the value is null
-    * @throws ClassCastException if the value is not an instance of string
+    * @throws ClassCastException   if the value is not an instance of string
     */
    protected void assertKeyValidity(Object value)
    {
@@ -53,11 +54,11 @@
    }
 
    /**
-    * Only check are made to the value. The only valid values accepted
-    * are non null instance of <code>org.jboss.portal.common.value.Value</code>.
+    * Only check are made to the value. The only valid values accepted are non null instance of
+    * <code>org.jboss.portal.common.value.Value</code>.
     *
     * @throws NullPointerException if the value is null
-    * @throws ClassCastException if the value type is not an instance of <code>org.jboss.portal.common.value.Value</code>
+    * @throws ClassCastException   if the value type is not an instance of <code>org.jboss.portal.common.value.Value</code>
     */
    protected Object getInternalValue(Object value)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/AccessMode.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 /**
@@ -39,9 +40,7 @@
    /** Clone before write access mode. */
    public static final AccessMode CLONE_BEFORE_WRITE = new AccessMode("CLONE_BEFORE_WRITE");
 
-   /**
-    * The type as a string.
-    */
+   /** The type as a string. */
    private final String name;
 
    private AccessMode(String name)

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/DestroyCloneFailure.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/DestroyCloneFailure.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/DestroyCloneFailure.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/InvalidStateIdException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/InvalidStateIdException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/InvalidStateIdException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/NoSuchStateException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/NoSuchStateException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/NoSuchStateException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletClonedEvent.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletClonedEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletClonedEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletModifiedEvent.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletModifiedEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/PortletModifiedEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/Property.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/Property.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/Property.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 import org.jboss.portal.common.value.Value;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyChange.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 import org.jboss.portal.common.value.Value;
@@ -47,7 +48,7 @@
    /**
     * Create a new property update.
     *
-    * @param key the property key
+    * @param key   the property key
     * @param value the property value
     * @return an instance representing a property update
     */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 import org.jboss.portal.common.value.Value;
-import org.jboss.portal.portlet.state.PropertyChange;
 
 import java.util.Set;
 
@@ -60,7 +60,7 @@
    /**
     * Update the preferences.
     *
-    * @throws IllegalStateException if the preferences is not writable
+    * @throws IllegalStateException    if the preferences is not writable
     * @throws IllegalArgumentException if any change is not valid
     */
    void update(PropertyChange[] changes) throws IllegalStateException;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/PropertyMap.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 import org.jboss.portal.common.value.Value;
 
-import java.util.Set;
-import java.util.Map;
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -43,14 +43,13 @@
    Value getProperty(String key) throws IllegalArgumentException;
 
    /**
-    * Update the value of the given key. If the value object is null
-    * it means that the entry must be removed. Implementation can throw
-    * an unsupported operation exception when it is abnormal to perform an update.
+    * Update the value of the given key. If the value object is null it means that the entry must be removed.
+    * Implementation can throw an unsupported operation exception when it is abnormal to perform an update.
     *
-    * @param key the key to update
+    * @param key   the key to update
     * @param value the new value
     * @throws UnsupportedOperationException if the operation is not supported
-    * @throws IllegalArgumentException if the key is null
+    * @throws IllegalArgumentException      if the key is null
     */
    void setProperty(String key, Value value) throws IllegalArgumentException, UnsupportedOperationException;
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/SimplePropertyMap.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.AbstractPropertyMap;
-
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConversionException.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConversionException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConversionException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConverter.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConverter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/StateConverter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 import org.jboss.portal.portlet.state.producer.ProducerState;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/StateManagementPolicy.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/StateManagementPolicy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/StateManagementPolicy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPersistenceManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.consumer;
 
 import org.jboss.portal.portlet.state.InvalidStateIdException;
@@ -36,8 +37,8 @@
     * @param stateId the state id
     * @return the value map or null if it does not exist
     * @throws IllegalArgumentException if the state id is null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    ConsumerStateContext loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -55,8 +56,8 @@
     * @param stateId
     * @param propertyMap the updated state
     * @throws IllegalArgumentException if the state id is null or the values are null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    void updateState(String stateId, ConsumerState propertyMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -65,8 +66,8 @@
     *
     * @param stateId
     * @throws IllegalArgumentException if the state id is null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    void destroyState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.consumer;
 
 import org.jboss.portal.common.NotYetImplemented;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerState.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerState.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerState.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.consumer;
 
 import java.util.Date;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerStateContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.consumer;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPersistenceManager.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPersistenceManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPersistenceManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.producer;
 
-import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.portlet.state.InvalidStateIdException;
 import org.jboss.portal.portlet.state.NoSuchStateException;
+import org.jboss.portal.portlet.state.PropertyMap;
 
 /**
  * An abstraction for enabling state management on the producer side.
@@ -39,8 +40,8 @@
     * @param stateId the state id
     * @return the value map or null if it does not exist
     * @throws IllegalArgumentException if the state id is null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    ProducerStateContext loadState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -59,20 +60,20 @@
     * @param stateId the id that this state refers to
     * @return the state id
     * @throws IllegalArgumentException if the state id is null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    String cloneState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
    /**
     * Clone an existing state.
     *
-    * @param stateId the id that this state refers to
+    * @param stateId     the id that this state refers to
     * @param propertyMap the values of the cloned state
     * @return the state id
     * @throws IllegalArgumentException if the state id is null or the value is nul
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    String cloneState(String stateId, PropertyMap propertyMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -82,8 +83,9 @@
     * @param stateId
     * @param propertyMap the updated state
     * @throws IllegalArgumentException if the state id is null or the values are null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws org.jboss.portal.portlet.state.InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws org.jboss.portal.portlet.state.InvalidStateIdException
+    *                                  if the state id is not valid
     */
    void updateState(String stateId, PropertyMap propertyMap) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 
@@ -92,8 +94,8 @@
     *
     * @param stateId
     * @throws IllegalArgumentException if the state id is null
-    * @throws NoSuchStateException is the specified state does not exist
-    * @throws InvalidStateIdException if the state id is not valid
+    * @throws NoSuchStateException     is the specified state does not exist
+    * @throws InvalidStateIdException  if the state id is not valid
     */
    void destroyState(String stateId) throws IllegalArgumentException, NoSuchStateException, InvalidStateIdException;
 }

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.producer;
 
 import org.jboss.portal.common.invocation.InvocationException;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerState.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerState.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerState.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.producer;
 
 import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.portlet.state.SimplePropertyMap;
 
+import java.io.Serializable;
 import java.util.Date;
-import java.io.Serializable;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerStateContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerStateContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerStateContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.state.producer;
 
 import org.jboss.portal.portlet.state.PropertyMap;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/ActionContextSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.support.spi;
 
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.StateString;
 import org.jboss.portal.portlet.spi.ActionContext;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.Parameters;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.support.spi;
 
+import org.jboss.portal.portlet.StateEvent;
 import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.StateEvent;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.support.spi;
 
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletURL;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
 import org.jboss.portal.common.invocation.AbstractInvocationContext;
+import org.jboss.portal.portlet.PortletURL;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
 import org.jboss.portal.server.util.HTTPStreamInfo;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/RenderContextSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.support.spi;
 
 import org.jboss.portal.portlet.spi.RenderContext;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.portlet.support.spi;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/support/spi/UserContextSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.support.spi;
 
 import org.jboss.portal.portlet.spi.UserContext;
 
+import java.util.List;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Locale;
-import java.util.List;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/tck/TCKPortletController.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.tck;
 
 import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.test.PortletController;
 import org.jboss.portal.server.ServerInvocation;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/ActionContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/ActionContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/ActionContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.support.spi.ActionContextSupport;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.Mode;
 import org.jboss.portal.server.impl.MapAttributeResolver;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/InstanceContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/InstanceContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/InstanceContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.StateEvent;
 import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.state.PortletClonedEvent;
 import org.jboss.portal.portlet.state.PortletModifiedEvent;
-import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/PortletController.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.common.NotYetImplemented;
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.common.util.URLTools;
-import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.portlet.ActionURL;
 import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.portlet.ParametersStateString;
 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.PortletRequestDecoder;
 import org.jboss.portal.portlet.PortletURL;
 import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.StateEvent;
 import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.PortletInvoker;
 import org.jboss.portal.portlet.impl.spi.AbstractPortletInvocationContext;
 import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
 import org.jboss.portal.portlet.impl.spi.AbstractSecurityContext;
@@ -50,8 +50,8 @@
 import org.jboss.portal.portlet.invocation.response.FragmentResponse;
 import org.jboss.portal.portlet.invocation.response.HTTPRedirectionResponse;
 import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.invocation.response.RenderResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.spi.ActionContext;
 import org.jboss.portal.portlet.spi.InstanceContext;
 import org.jboss.portal.portlet.spi.PortalContext;
@@ -70,6 +70,7 @@
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.request.URLFormat;
 import org.jboss.portal.server.util.HTTPStreamInfo;
+import org.jboss.portal.test.framework.container.TestCaseContext;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 import org.jboss.portal.common.util.CollectionBuilder;
 import org.jboss.portal.portlet.spi.PortalContext;
 
+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 at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortletInvoker.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
 import org.jboss.portal.common.invocation.InterceptorStackFactory;
-import org.jboss.portal.common.invocation.InvocationHandler;
 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.jems.as.system.AbstractJBossService;
 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.PortletInvoker;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
 
+import java.util.List;
 import java.util.Set;
-import java.util.List;
 
 /**
  * A simple consumer.
@@ -113,11 +114,11 @@
       {
          if (e instanceof PortletInvokerException)
          {
-            throw (PortletInvokerException)e;
+            throw(PortletInvokerException)e;
          }
          else if (e instanceof RuntimeException)
          {
-            throw (RuntimeException)e;
+            throw(RuntimeException)e;
          }
          else
          {

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/TestSecurityInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
+import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.PortletInvokerException;
 import org.jboss.portal.portlet.invocation.PortletInterceptor;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
 import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
 import org.jboss.portal.portlet.security.PortletPermission;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.common.invocation.InvocationException;
+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;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -40,9 +40,7 @@
 public class TestSecurityInterceptor extends PortletInterceptor
 {
 
-   /**
-    * The auth manager factory.
-    */
+   /** The auth manager factory. */
    private PortalAuthorizationManagerFactory pamf;
 
    public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory()

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/UserContextImpl.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/UserContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/UserContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
 import org.jboss.portal.portlet.support.spi.UserContextSupport;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/UserInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -35,7 +36,6 @@
 /**
  * The user interceptor is a simple implementation that is used to run the portlet controller.
  *
- * 
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/ValueMapAssert.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test;
 
 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;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletInvokerSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,46 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support;
 
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+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.PortletInvoker;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.PropertyChange;
 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.jems.as.system.AbstractJBossService;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
 
-import java.util.Map;
 import java.util.HashMap;
-import java.util.Set;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/PortletSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support;
 
-import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
+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.info.PortletInfo;
+import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/CacheInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
+import org.jboss.portal.portlet.container.info.ContainerCacheInfo;
 import org.jboss.portal.portlet.info.CacheInfo;
-import org.jboss.portal.portlet.container.info.ContainerCacheInfo;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/MetaInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/MetaInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/MetaInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
+import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.portlet.info.MetaInfo;
-import org.jboss.portal.common.util.LocalizedString;
 
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/ModeInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
-import org.jboss.portal.portlet.info.ModeInfo;
 import org.jboss.portal.Mode;
 import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.portlet.info.ModeInfo;
 
 import java.util.Locale;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PortletInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
+import org.jboss.portal.portlet.info.CacheInfo;
+import org.jboss.portal.portlet.info.CapabilitiesInfo;
+import org.jboss.portal.portlet.info.MetaInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.CapabilitiesInfo;
 import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.MetaInfo;
 import org.jboss.portal.portlet.info.SecurityInfo;
-import org.jboss.portal.portlet.info.CacheInfo;
 import org.jboss.portal.portlet.info.SessionInfo;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferenceInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
-import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.info.PreferenceInfo;
 
 import java.util.Locale;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/PreferencesInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.PreferenceInfo;
-import org.jboss.portal.common.value.Value;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SecurityInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
+import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.portlet.TransportGuarantee;
 import org.jboss.portal.portlet.info.SecurityInfo;
-import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.common.util.CollectionBuilder;
 
 import java.util.Set;
 

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/SessionInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
 import org.jboss.portal.portlet.info.SessionInfo;

Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/support/info/WindowStateInfoSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.portlet.test.support.info;
 
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.util.LocalizedString;
 import org.jboss.portal.portlet.info.WindowStateInfo;
-import org.jboss.portal.common.util.LocalizedString;
-import org.jboss.portal.WindowState;
 
 import java.util.Locale;
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Joinpoint.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet;
 
 /**
@@ -102,7 +103,6 @@
       }
 
 
-
       Joinpoint j = (Joinpoint)obj;
 
       //System.out.println("%%%%%%%%%%Comparing: " + j.toString() + " to " + this.toString());

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/Sequence.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet;
 
+import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.portlet.actions.TestAction;
 import org.jboss.portal.test.framework.server.NodeId;
-import org.jboss.portal.test.framework.container.result.AssertResult;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Keeps sequents of TestActions for one test. Actions are binded to specific request counts
- * with Jointcuts
+ * Keeps sequents of TestActions for one test. Actions are binded to specific request counts with Jointcuts
  *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet;
 
 
@@ -38,7 +39,7 @@
 
    private Map registry = null;
 
-   public  SequenceRegistry()
+   public SequenceRegistry()
    {
       registry = new HashMap();
    }

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/SequenceRegistryBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet;
 
 import org.apache.log4j.Logger;
@@ -34,8 +35,8 @@
 import java.util.regex.Pattern;
 
 /**
- * Builder is invoked when web application initialization process is starting.
- * It builds sequence of tests for this action
+ * Builder is invoked when web application initialization process is starting. It builds sequence of tests for this
+ * action
  *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
@@ -62,9 +63,9 @@
    }
 
    /**
-    * Finds all methods matching pattern in current instance and invokes them.
-    * Methods add Sequence into SequenceRegistry. Then SequenceRegistry is injected into
-    * ServletContext
+    * Finds all methods matching pattern in current instance and invokes them. Methods add Sequence into
+    * SequenceRegistry. Then SequenceRegistry is injected into ServletContext
+    *
     * @param sce
     */
    public void contextInitialized(ServletContextEvent sce)
@@ -73,7 +74,6 @@
       log.info("RegistryBuilder invoked with instance of: '" + this.getClass().getName() + "' class");
       setRegistry(new SequenceRegistry());
 
-
       //we invoke all createXXX methods to fill seqenceRegistry
       List methods = findMethods(SequenceRegistryBuilder.METHOD_PATTERN);
       for (int i = 0; i < methods.size(); i++)
@@ -86,12 +86,12 @@
          }
          catch (IllegalAccessException e)
          {
-            log.info("Error during '" + m.getName() + "' method invokation: "  + e.getMessage());
+            log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage());
             e.printStackTrace();
          }
          catch (InvocationTargetException e)
          {
-            log.info("Error during '" + m.getName() + "' method invokation: "  + e.getMessage());
+            log.info("Error during '" + m.getName() + "' method invokation: " + e.getMessage());
             e.printStackTrace();
          }
       }
@@ -106,6 +106,7 @@
 
    /**
     * Returning List of Method objects matching given name pattern
+    *
     * @param namePattern
     * @return List of Method objects
     */
@@ -119,9 +120,9 @@
       {
          Method m = (Method)allMethods.get(i);
          if (Pattern.matches(namePattern, m.getName()) &&
-             m.getParameterTypes().length == 1 &&
-             ((Class)m.getParameterTypes()[0]).equals(SequenceRegistry.class) &&
-             Modifier.isPublic(m.getModifiers()))
+            m.getParameterTypes().length == 1 &&
+            ((Class)m.getParameterTypes()[0]).equals(SequenceRegistry.class) &&
+            Modifier.isPublic(m.getModifiers()))
          {
             methods.add(m);
          }

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestContants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet;
 
 /**
@@ -30,19 +31,13 @@
 public interface TestContants
 {
 
-   /**
-    * String from PortletContext.getServerInfo()
-    */
+   /** String from PortletContext.getServerInfo() */
    String SERVER_INVO = "JBossPortal/1.0";
 
-   /**
-    * int for PortletContext.getMinorVersion();
-    */
+   /** int for PortletContext.getMinorVersion(); */
    int MINOR_VERSION = 0;
 
-   /**
-    * int for PortletContext.getMajorVersion();
-    */
+   /** int for PortletContext.getMajorVersion(); */
    int MAJOR_VERSION = 1;
 
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletActionTestAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.actions;
 
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.Result;
 
 import javax.portlet.ActionRequest;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/PortletRenderTestAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.actions;
 
 import org.jboss.portal.test.framework.container.result.Result;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/ServletServiceTestAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.actions;
 
 import junit.framework.AssertionFailedError;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/actions/TestAction.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.actions;
 
+import junit.framework.AssertionFailedError;
 import org.jboss.portal.common.junit.ExtendedAssert;
 import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.Result;
 
-import junit.framework.AssertionFailedError;
-
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
@@ -36,7 +36,7 @@
 
    protected Result decode(Throwable t)
    {
-      for (Throwable u = t;u != null;u = u.getCause())
+      for (Throwable u = t; u != null; u = u.getCause())
       {
          if (u instanceof AssertionFailedError)
          {

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -46,17 +47,18 @@
  */
 public class BasicTestSequenceBuilder extends SequenceRegistryBuilder
 {
-  /* private Joinpoint portletARender = new Joinpoint("PortletA", Joinpoint.PORTLET_RENDER);
-   private Joinpoint portletAAction = new Joinpoint("PortletA", Joinpoint.PORTLET_ACTION);
-   private Joinpoint portletBRender = new Joinpoint("PortletB", Joinpoint.PORTLET_RENDER);
-   private Joinpoint portletBAction = new Joinpoint("PortletB", Joinpoint.PORTLET_ACTION);*/
+   /* private Joinpoint portletARender = new Joinpoint("PortletA", Joinpoint.PORTLET_RENDER);
+private Joinpoint portletAAction = new Joinpoint("PortletA", Joinpoint.PORTLET_ACTION);
+private Joinpoint portletBRender = new Joinpoint("PortletB", Joinpoint.PORTLET_RENDER);
+private Joinpoint portletBAction = new Joinpoint("PortletB", Joinpoint.PORTLET_ACTION);*/
 
 
    public void createOnePortletTestCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
-      registry.addSequence("OnePortlet",seq);
-      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      registry.addSequence("OnePortlet", seq);
+      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new EndTestResult();
@@ -67,8 +69,9 @@
    public void createFailurePortletTestCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
-      registry.addSequence("FailurePortlet",seq);
-      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      registry.addSequence("FailurePortlet", seq);
+      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new FailureResult();
@@ -79,8 +82,9 @@
    public void createFailAssertPortletTestCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
-      registry.addSequence("FailAssertPortlet",seq);
-      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      registry.addSequence("FailAssertPortlet", seq);
+      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             fail();
@@ -92,8 +96,9 @@
    public void createFailAssertInActionPortletTestCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
-      registry.addSequence("FailAssertInActionPortlet",seq);
-      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      registry.addSequence("FailAssertInActionPortlet", seq);
+      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             PortletURL url = response.createActionURL();
@@ -101,7 +106,8 @@
          }
       });
 
-      seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction(){
+      seq.addAction(1, UTP1.ACTION_JOINPOINT, new PortletActionTestAction()
+      {
          protected void run(Portlet portlet, ActionRequest request, ActionResponse response)
          {
             fail();
@@ -109,7 +115,8 @@
       });
 
       //this shouldn't be reached
-      seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      seq.addAction(1, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new EndTestResult();
@@ -120,8 +127,9 @@
    public void createTwoPortletTestCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
-      registry.addSequence("TwoPortlet",seq);
-      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      registry.addSequence("TwoPortlet", seq);
+      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             PortletURL url = response.createActionURL();
@@ -129,7 +137,8 @@
          }
       });
 
-      seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      seq.addAction(1, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new EndTestResult();
@@ -140,15 +149,17 @@
    public void createTwoResultPortletTestCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
-      registry.addSequence("TwoResultPortlet",seq);
-      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      registry.addSequence("TwoResultPortlet", seq);
+      seq.addAction(0, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new EndTestResult();
          }
       });
 
-      seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction(){
+      seq.addAction(0, UTP2.RENDER_JOINPOINT, new PortletRenderTestAction()
+      {
          protected Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new EndTestResult();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/BasicTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletA.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests;
 
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/PortletB.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests;
 
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/JoinpointTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests.classes;
 
 import junit.framework.TestCase;
@@ -33,7 +34,7 @@
    public void testCreate()
    {
       Joinpoint joinpoint = new Joinpoint("portlet1", Joinpoint.PORTLET_ACTION);
-      assertEquals("portlet1",joinpoint.getId());
+      assertEquals("portlet1", joinpoint.getId());
       assertEquals(Joinpoint.PORTLET_ACTION, joinpoint.getPoint());
    }
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryBuilderTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests.classes;
 
 import junit.framework.TestCase;
@@ -40,7 +41,6 @@
       final List invoked = new LinkedList();
 
 
-
       TestBuilder srb2 = new TestBuilder();
 
       assertEquals(0, srb2.counter);
@@ -49,7 +49,6 @@
 
       assertEquals(2, srb2.counter);
 
-
       /*SequenceRegistryBuilder srb = new SequenceRegistryBuilder()
       {
          protected SequenceRegistry getRegistry()

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceRegistryTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests.classes;
 
 import junit.framework.TestCase;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/SequenceTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests.classes;
 
 import junit.framework.TestCase;
@@ -43,7 +44,8 @@
    {
       Sequence sequence = new Sequence();
       Joinpoint joinpoint = new Joinpoint("PortletA", Joinpoint.PORTLET_RENDER);
-      TestAction action = new PortletRenderTestAction(){
+      TestAction action = new PortletRenderTestAction()
+      {
          public Result run(Portlet portlet, RenderRequest request, RenderResponse response)
          {
             return new InvokeGetResult("http://www.jboss.com");
@@ -63,7 +65,6 @@
       assertNull(sequence.getAction(1, joinpoint));
 
 
-
    }
 
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/basictests/classes/TestBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.basictests.classes;
 
 import org.jboss.portal.test.framework.portlet.SequenceRegistry;
@@ -45,7 +46,7 @@
       counter++;
    }
 
-   protected void saveRegistry(SequenceRegistry registry, ServletContext context )
+   protected void saveRegistry(SequenceRegistry registry, ServletContext context)
    {
       //nothing
    }

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestGenericPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.components;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -40,23 +41,16 @@
  */
 public abstract class AbstractTestGenericPortlet extends GenericPortlet
 {
-   /**
-    * The test id.
-    */
+   /** The test id. */
    private final String testCaseId;
 
-   /**
-    * Construct a test portlet with a test id computed with the
-    * method <code>getTestId(Class)</code>.
-    */
+   /** Construct a test portlet with a test id computed with the method <code>getTestId(Class)</code>. */
    public AbstractTestGenericPortlet()
    {
       testCaseId = createCaseTestId(getClass());
    }
 
-   /**
-    * Get the test id from the class name. It can be overriden.
-    */
+   /** Get the test id from the class name. It can be overriden. */
    protected String createCaseTestId(Class clazz)
    {
       String s = clazz.getName();
@@ -80,9 +74,9 @@
    {
       if (TestCaseContext.isCurrentCaseTestId(testCaseId))
       {
-         doRenderInit(request,response);
-         super.render(request,response);
-         doRenderFinal(request,response);
+         doRenderInit(request, response);
+         super.render(request, response);
+         doRenderFinal(request, response);
       }
    }
 
@@ -93,8 +87,8 @@
    }
 
    /**
-    * Invoked by render() method if current test is running. After this method GenericPortlet.render() will be
-    * called.
+    * Invoked by render() method if current test is running. After this method GenericPortlet.render() will be called.
+    *
     * @param req
     * @param resp
     * @throws PortletException
@@ -108,6 +102,7 @@
 
    /**
     * Invoked by render() method after GenericPortlet.render() invocation.
+    *
     * @param req
     * @param resp
     * @throws PortletException
@@ -120,5 +115,4 @@
    }
 
 
-
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractTestPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.components;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -46,13 +47,10 @@
    /** The test id. */
    private final String testCaseId;
 
-   /** To keep PortletConfig for some tests**/
+   /** To keep PortletConfig for some tests* */
    private PortletConfig config;
 
-   /**
-    * Construct a test portlet with a test id computed with the
-    * method <code>getTestId(Class)</code>.
-    */
+   /** Construct a test portlet with a test id computed with the method <code>getTestId(Class)</code>. */
    public AbstractTestPortlet()
    {
       testCaseId = createCaseTestId(getClass());
@@ -76,13 +74,13 @@
 
    public void init(PortletConfig config) throws PortletException
    {
-       this.config = config;
+      this.config = config;
    }
 
    /**
     * Returns the PortletConfig object of this portlet.
     *
-    * @return   the PortletConfig object of this portlet
+    * @return the PortletConfig object of this portlet
     */
    public PortletConfig getPortletConfig()
    {
@@ -90,10 +88,9 @@
    }
 
    /**
-    * Returns the <code>PortletContext</code> of the portlet application
-    * the portlet is in.
+    * Returns the <code>PortletContext</code> of the portlet application the portlet is in.
     *
-    * @return   the portlet application context
+    * @return the portlet application context
     */
    public PortletContext getPortletContext()
    {
@@ -130,9 +127,7 @@
       throw new PortletException();
    }
 
-   /**
-    * Get the test id from the class name. It can be overriden.
-    */
+   /** Get the test id from the class name. It can be overriden. */
    protected String createCaseTestId(Class clazz)
    {
       String s = clazz.getName();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.components;
 
 import org.apache.log4j.Logger;
 import org.jboss.portal.test.framework.container.TestCaseContext;
-import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.container.result.FailureResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Joinpoint;
 import org.jboss.portal.test.framework.portlet.Sequence;
 import org.jboss.portal.test.framework.portlet.SequenceRegistry;
@@ -69,10 +70,7 @@
    /** To keep PortletConfig for some tests*-. */
    private PortletConfig config;
 
-   /**
-    * Construct a test portlet with a test id computed with the
-    * method <code>getComponentId()</code>.
-    */
+   /** Construct a test portlet with a test id computed with the method <code>getComponentId()</code>. */
    public AbstractUniversalTestPortlet()
    {
       String componentId = createComponentId();
@@ -117,8 +115,7 @@
    }
 
    /**
-    * Returns the <code>PortletContext</code> of the portlet application
-    * the portlet is in.
+    * Returns the <code>PortletContext</code> of the portlet application the portlet is in.
     *
     * @return the portlet application context
     */
@@ -143,9 +140,8 @@
       //
       log.debug("Component '" + getComponentId() + "' processAction() method invoked for '"
          + ctx.getTestCaseId() + "' testId and '" +
-         + ctx.getRequestCount() + "' request count");
+         +ctx.getRequestCount() + "' request count");
 
-
       //
       Sequence sequence = getSequence();
 
@@ -178,8 +174,8 @@
    }
 
    /**
-    * Invokes current action from Sequence. If failed AssertResult was returned in previouse portlet action
-    * phase it will be marshalled.
+    * Invokes current action from Sequence. If failed AssertResult was returned in previouse portlet action phase it
+    * will be marshalled.
     *
     * @param req
     * @param resp
@@ -194,7 +190,7 @@
       //
       log.debug("Component '" + getComponentId() + "' render() method invoked for '"
          + ctx.getTestCaseId() + "' testId and '" +
-         + ctx.getRequestCount() + "' request count");
+         +ctx.getRequestCount() + "' request count");
 
       // Reset AssertResult at begining of test
       if (ctx.getRequestCount() == 0)
@@ -231,9 +227,7 @@
    {
    }
 
-   /**
-    * Get the componentId from the class name.
-    */
+   /** Get the componentId from the class name. */
    protected String createComponentId()
    {
       String s = getClass().getName();
@@ -246,8 +240,8 @@
    }
 
    /**
-    * Returns SequenceRegistry which should be injected into ServletContext
-    * Returns null if there is no SequenceRegistry in context
+    * Returns SequenceRegistry which should be injected into ServletContext Returns null if there is no SequenceRegistry
+    * in context
     *
     * @return SequenceRegistry
     */
@@ -257,8 +251,7 @@
    }
 
    /**
-    * Returns Sequence for current testId
-    * Returns null if there is no Sequence for current testId
+    * Returns Sequence for current testId Returns null if there is no Sequence for current testId
     *
     * @return
     * @throws PortletException if there is no SequenceRegistry
@@ -293,9 +286,7 @@
    {
    }
 
-   /**
-    * Can be subclassed to provide an alternative way to create the logger.
-    */
+   /** Can be subclassed to provide an alternative way to create the logger. */
    protected Logger createLogger()
    {
       if (log != null)
@@ -305,9 +296,7 @@
       return Logger.getLogger(getClass());
    }
 
-   /**
-    * Return the logger.
-    */
+   /** Return the logger. */
    public final Logger getLogger()
    {
       return log;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/components/AbstractUniversalTestServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.components;
 
 import org.apache.log4j.Logger;
@@ -49,22 +50,15 @@
 
    private final Logger log = Logger.getLogger(getClass());
 
-   /**
-    * The test id.
-    */
+   /** The test id. */
    private String componentId;
 
 
-   /**
-    * Jointpoints for service method
-    */
+   /** Jointpoints for service method */
    protected Joinpoint serviceJoinpoint;
 
 
-   /**
-    * Construct a test servlet with a test id computed with the
-    * method <code>getTestId(Class)</code>.
-    */
+   /** Construct a test servlet with a test id computed with the method <code>getTestId(Class)</code>. */
    public AbstractUniversalTestServlet()
    {
       super();
@@ -94,8 +88,8 @@
    }
 
    /**
-    * Standart implementation of service() method to handle requests and invoke actions
-    * from sequence
+    * Standart implementation of service() method to handle requests and invoke actions from sequence
+    *
     * @param request
     * @param response
     * @throws ServletException
@@ -108,7 +102,7 @@
       //
       log.info("Component '" + getComponentId() + "' service() method invoked for '"
          + ctx.getTestCaseId() + "' testId and '" +
-         + ctx.getRequestCount() + "' request count");
+         +ctx.getRequestCount() + "' request count");
 
       // Reset instance state
       if (ctx.getRequestCount() == 0)
@@ -133,9 +127,7 @@
       }
    }
 
-   /**
-    * Get the componentId from the class name.
-    */
+   /** Get the componentId from the class name. */
    protected String createComponentId(Class clazz)
    {
       String s = clazz.getName();
@@ -149,8 +141,8 @@
 
 
    /**
-    * Returns SequenceRegistry which should be injected into ServletContext
-    * Returns null if there is no SequenceRegistry in context
+    * Returns SequenceRegistry which should be injected into ServletContext Returns null if there is no SequenceRegistry
+    * in context
     *
     * @return SequenceRegistry
     */
@@ -161,8 +153,7 @@
    }
 
    /**
-    * Returns Sequence for current testId
-    * Returns null if there is no Sequence for current testId
+    * Returns Sequence for current testId Returns null if there is no Sequence for current testId
     *
     * @return
     * @throws javax.servlet.ServletException if there is no SequenceRegistry

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP1.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -56,9 +57,7 @@
       return NAME;
    }
 
-   /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP10.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.framework.portlet.Joinpoint;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -45,9 +46,7 @@
       return UTP10.NAME;
    }
 
-   /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP10.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP2.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       local.set(null);

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP3.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP3.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP4.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP4.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP4.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP5.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP5.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP5.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP6.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP6.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP6.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP7.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP7.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP7.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP8.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP8.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP8.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTP9.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -45,9 +46,7 @@
       return UTP9.NAME;
    }
 
-      /**
-    * Resets helper variables
-    */
+   /** Resets helper variables */
    public void reset()
    {
       UTP9.local = new ThreadLocal();

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS1.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;

Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/universal/UTS2.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.portlet.universal;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ParametersTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet;
 
+import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.test.AbstractTestCase;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.portal.test.AbstractTestCase;
-import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.portlet.Parameters;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
 public class ParametersTestCase
-      extends AbstractTestCase
+   extends AbstractTestCase
 {
 
    public ParametersTestCase(String name)
@@ -117,9 +118,9 @@
 
    public void testSetValues()
    {
-      param.setValues("a", new String[] { "b", "c" });
-      assertTrue(Arrays.equals(param.getValues("a"), new String[] {
-            "b", "c" }));
+      param.setValues("a", new String[]{"b", "c"});
+      assertTrue(Arrays.equals(param.getValues("a"), new String[]{
+         "b", "c"}));
       assertEquals(param.getValue("a"), "b");
    }
 
@@ -127,7 +128,7 @@
    {
       try
       {
-         param.setValues(null, new String[] { "a" });
+         param.setValues(null, new String[]{"a"});
          fail("Expected IllegalArgumentException");
       }
       catch (NullPointerException e)
@@ -163,7 +164,7 @@
    {
       try
       {
-         param.setValues("a", new String[] { "a", null });
+         param.setValues("a", new String[]{"a", null});
          fail("Expected IllegalArgumentException");
       }
       catch (IllegalArgumentException e)
@@ -187,17 +188,17 @@
    {
       Parameters other = new Parameters();
       other.setValue("a", "b");
-      other.setValues("c", new String[] { "d", "e" });
+      other.setValues("c", new String[]{"d", "e"});
       param.replace(other);
       assertEquals("b", param.getValue("a"));
-      assertTrue(Arrays.equals(param.getValues("c"), new String[] {"d", "e" }));
+      assertTrue(Arrays.equals(param.getValues("c"), new String[]{"d", "e"}));
    }
 
    public void testCopyConstructorWithNullParameters()
    {
       try
       {
-         new Parameters((Parameters) null);
+         new Parameters((Parameters)null);
          fail("Expected IllegalArgumentException");
       }
       catch (IllegalArgumentException e)
@@ -209,7 +210,7 @@
    {
       try
       {
-         new Parameters((Map) null);
+         new Parameters((Map)null);
          fail("Expected IllegalArgumentException");
       }
       catch (IllegalArgumentException e)
@@ -251,17 +252,17 @@
    public void testReplace()
    {
       param.setValue("a", "b");
-      param.setValues("c", new String[]{"d","e"});
+      param.setValues("c", new String[]{"d", "e"});
       param.setValue("f", "g");
       Map map = new HashMap();
       map.put("a", new String[]{"_b"});
-      map.put("c", new String[]{"_d","_e"});
+      map.put("c", new String[]{"_d", "_e"});
       map.put("h", new String[]{"_i"});
       param.replace(map);
       assertEquals(3, param.size());
-      ExtendedAssert.assertEquals(param.getValues("a"), new String[] {"_b"});
-      ExtendedAssert.assertEquals(param.getValues("c"), new String[] {"_d","_e"});
-      ExtendedAssert.assertEquals(param.getValues("h"), new String[] {"_i"});
+      ExtendedAssert.assertEquals(param.getValues("a"), new String[]{"_b"});
+      ExtendedAssert.assertEquals(param.getValues("c"), new String[]{"_d", "_e"});
+      ExtendedAssert.assertEquals(param.getValues("h"), new String[]{"_i"});
    }
 
    public void testAppendWithInvalidMap()
@@ -286,18 +287,18 @@
    public void testAppend()
    {
       param.setValue("a", "b");
-      param.setValues("c", new String[]{"d","e"});
+      param.setValues("c", new String[]{"d", "e"});
       param.setValue("f", "g");
       Map map = new HashMap();
       map.put("a", new String[]{"_b"});
-      map.put("c", new String[]{"_d","_e"});
+      map.put("c", new String[]{"_d", "_e"});
       map.put("h", new String[]{"_i"});
       param.append(map);
       assertEquals(4, param.size());
-      ExtendedAssert.assertEquals(param.getValues("a"), new String[] {"b","_b"});
-      ExtendedAssert.assertEquals(param.getValues("c"), new String[] {"d","e","_d","_e"});
-      ExtendedAssert.assertEquals(param.getValues("f"), new String[] {"g"});
-      ExtendedAssert.assertEquals(param.getValues("h"), new String[] {"_i"});
+      ExtendedAssert.assertEquals(param.getValues("a"), new String[]{"b", "_b"});
+      ExtendedAssert.assertEquals(param.getValues("c"), new String[]{"d", "e", "_d", "_e"});
+      ExtendedAssert.assertEquals(param.getValues("f"), new String[]{"g"});
+      ExtendedAssert.assertEquals(param.getValues("h"), new String[]{"_i"});
    }
 
    public void testClear()
@@ -310,12 +311,12 @@
    public Class[] buildExceptionClasses()
    {
       return new Class[]
-      {
-         NullPointerException.class,
-         IllegalArgumentException.class,
-         IllegalArgumentException.class,
-         ClassCastException.class
-      };
+         {
+            NullPointerException.class,
+            IllegalArgumentException.class,
+            IllegalArgumentException.class,
+            ClassCastException.class
+         };
    }
 
    public Map[] buildInvalidMaps()
@@ -325,9 +326,9 @@
       Map map2 = new HashMap();
       map2.put("a", new String[0]);
       Map map3 = new HashMap();
-      map3.put("a", new String[] { null });
+      map3.put("a", new String[]{null});
       Map map4 = new HashMap();
       map4.put("a", new Object());
-      return new Map[]{map1,map2,map3,map4};
+      return new Map[]{map1, map2, map3, map4};
    }
 }
\ No newline at end of file

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet;
 
 import junit.framework.TestCase;
-import org.jboss.portal.portlet.PortletRequestDecoder;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.OpaqueStateString;
-import org.jboss.portal.portlet.Parameters;
 import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.OpaqueStateString;
+import org.jboss.portal.portlet.Parameters;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.PortletRequestDecoder;
 
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -129,7 +130,7 @@
       try
       {
          queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.MODE_MASK | PortletRequestDecoder.ACTION_MASK)));
-         bodyParams.put(PortletRequestDecoder.MODE_PARAMETER,asStringArray(Mode.VIEW.toString()));
+         bodyParams.put(PortletRequestDecoder.MODE_PARAMETER, asStringArray(Mode.VIEW.toString()));
          o.decode(queryParams, bodyParams);
          fail();
       }
@@ -192,7 +193,7 @@
       queryParams.clear();
 
       // Query mode two values
-      queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(),Mode.EDIT.toString()});
+      queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), Mode.EDIT.toString()});
       o.decode(queryParams, null);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -238,7 +239,7 @@
       queryParams.clear();
 
       // Body window state
-      bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER,asStringArray(WindowState.NORMAL.toString()));
+      bodyParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString()));
       o.decode(queryParams, bodyParams);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -277,7 +278,6 @@
       assertNull(o.getWindowState());
       queryParams.clear();
 
-
       // Query window state
       queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)));
       queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString()));
@@ -313,7 +313,7 @@
       queryParams.clear();
 
       // Query meta parameter
-      queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK),"bar"});
+      queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK), "bar"});
       o.decode(queryParams, null);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -326,8 +326,8 @@
       queryParams.clear();
 
       // Query window state parameter + window state meta parameter
-      queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK|PortletRequestDecoder.WINDOW_STATE_MASK)});
-      queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(),"bar"});
+      queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)});
+      queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, new String[]{WindowState.NORMAL.toString(), "bar"});
       o.decode(queryParams, null);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -354,8 +354,8 @@
       queryParams.clear();
 
       // Query mode parameter + mode meta parameter
-      queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK|PortletRequestDecoder.MODE_MASK)});
-      queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(),"bar"});
+      queryParams.put(PortletRequestDecoder.META_PARAMETER, new String[]{Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.MODE_MASK)});
+      queryParams.put(PortletRequestDecoder.MODE_PARAMETER, new String[]{Mode.VIEW.toString(), "bar"});
       o.decode(queryParams, null);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
@@ -396,12 +396,12 @@
       bodyParams.clear();
 
       // Query multivalued parameter
-      queryParams.put(PortletRequestDecoder.META_PARAMETER,asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK)));
-      queryParams.put("foo", new String[]{"bar1","bar2"});
+      queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK)));
+      queryParams.put("foo", new String[]{"bar1", "bar2"});
       o.decode(queryParams, null);
       assertNull(o.getForm());
       assertNull(o.getInteractionState());
-      navState.setValues("foo", new String[]{"bar1","bar2"});
+      navState.setValues("foo", new String[]{"bar1", "bar2"});
       assertEquals(navState, o.getNavigationalstate());
       assertEquals(PortletRequestDecoder.RENDER_TYPE, o.getType());
       assertNull(o.getMode());
@@ -469,7 +469,7 @@
       bodyParams.clear();
 
       // Query int state is ignored
-      queryParams.put(PortletRequestDecoder.META_PARAMETER,asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK)));
+      queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.RENDER_MASK | PortletRequestDecoder.OPAQUE_MASK)));
       queryParams.put(PortletRequestDecoder.INTERACTION_STATE_PARAMETER, asStringArray("intstatevalue"));
       o.decode(queryParams, null);
       assertNull(o.getForm());
@@ -522,10 +522,9 @@
       assertNull(o.getWindowState());
       queryParams.clear();
 
-
       // Query window state
       queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.WINDOW_STATE_MASK)));
-      queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray( WindowState.NORMAL.toString()));
+      queryParams.put(PortletRequestDecoder.WINDOW_STATE_PARAMETER, asStringArray(WindowState.NORMAL.toString()));
       o.decode(queryParams, null);
       assertEquals(new Parameters(), o.getForm());
       assertEquals(new ParametersStateString(), o.getInteractionState());
@@ -561,10 +560,10 @@
 
       // Query multivalued parameter
       queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
-      queryParams.put("foo", new String[]{"bar1","bar2"});
+      queryParams.put("foo", new String[]{"bar1", "bar2"});
       o.decode(queryParams, null);
       assertEquals(form, o.getForm());
-      intState.setValues("foo", new String[]{"bar1","bar2"});
+      intState.setValues("foo", new String[]{"bar1", "bar2"});
       assertEquals(intState, o.getInteractionState());
       assertNull(o.getNavigationalstate());
       assertEquals(PortletRequestDecoder.ACTION_TYPE, o.getType());
@@ -592,9 +591,9 @@
 
       // Body multivalued parameter
       queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK)));
-      bodyParams.put("foo", new String[]{"bar1","bar2"});
+      bodyParams.put("foo", new String[]{"bar1", "bar2"});
       o.decode(queryParams, bodyParams);
-      form.setValues("foo", new String[]{"bar1","bar2"});
+      form.setValues("foo", new String[]{"bar1", "bar2"});
       assertEquals(form, o.getForm());
       assertEquals(intState, o.getInteractionState());
       assertNull(o.getNavigationalstate());
@@ -651,13 +650,13 @@
       // Body parameters
       queryParams.put(PortletRequestDecoder.META_PARAMETER, asStringArray(Integer.toHexString(PortletRequestDecoder.ACTION_MASK | PortletRequestDecoder.OPAQUE_MASK)));
       bodyParams.put("foo1", asStringArray("bar1"));
-      bodyParams.put("foo2", new String[]{"bar2","bar3"});
+      bodyParams.put("foo2", new String[]{"bar2", "bar3"});
       queryParams.put("foo3", new String[]{"bar4"});
       bodyParams.put("foo3", new String[]{"bar5"});
       o.decode(queryParams, bodyParams);
       Parameters form = new Parameters();
       form.setValue("foo1", "bar1");
-      form.setValues("foo2", new String[]{"bar2","bar3"});
+      form.setValues("foo2", new String[]{"bar2", "bar3"});
       form.setValues("foo3", new String[]{"bar5"});
       assertEquals(form, o.getForm());
       assertNull(o.getInteractionState());

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/PropertiesTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet;
 
 import junit.framework.TestCase;
-
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.portlet.Properties;
 
@@ -84,7 +84,7 @@
 
       assertEquals(null, props.getProperties("not here"));
       assertNull(props.getProperty("not here"));
-      assertEquals(Tools.toSet(new Object[]{"name1","name2","name3","name4","name5","name6"}), props.getPropertyNames());
+      assertEquals(Tools.toSet(new Object[]{"name1", "name2", "name3", "name4", "name5", "name6"}), props.getPropertyNames());
 
       try
       {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.deployment;
 
 import junit.framework.TestCase;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/MutableValue.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.ha.session;
 
 import java.io.Serializable;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.ha.session;
 
+import org.jboss.portal.test.framework.container.TestCaseContext;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.framework.portlet.Sequence;
 import org.jboss.portal.test.framework.portlet.SequenceRegistry;
-import org.jboss.portal.test.framework.portlet.Sequence;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.server.NodeId;
 
 import javax.portlet.Portlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletSession;
 import javax.portlet.PortletURL;
-import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
 import java.io.IOException;
 
 /**
@@ -82,7 +83,7 @@
       registry.addSequence("ABC", seq);
       seq.addAction(0, NodeId.PORTS_01, UTP1.RENDER_JOINPOINT, new PortletRenderTestAction()
       {
-         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response) throws  IOException
+         protected Result run(Portlet portlet, RenderRequest request, RenderResponse response) throws IOException
          {
             assertNull(request.getPortletSession(false));
             PortletSession session = request.getPortletSession();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.ha.session;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.server.NodeId;
 
 /**
@@ -34,7 +35,7 @@
 {
    public static Test suite()
    {
-      TestSuite suite = new TestSuite("test-ha-session.war", new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+      TestSuite suite = new TestSuite("test-ha-session.war", new NodeId[]{NodeId.PORTS_01, NodeId.PORTS_02});
       suite.addTest(new TestCase(NodeId.PORTS_01, "ABC"));
       return suite;
    }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.info.CacheInfo;
 import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.CacheInfo;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.portlet.info;
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/InfoTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/MetaInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
 import org.jboss.portal.common.util.LocalizedString;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.Mode;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.info.CapabilitiesInfo;
 import org.jboss.portal.portlet.info.ModeInfo;
-import org.jboss.portal.Mode;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
-import java.util.Set;
-import java.util.Iterator;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -66,7 +67,6 @@
             PortletContainer container2 = registry.getPortletContainer("/test-info.ModePortlet2");
             CapabilitiesInfo capaInfo = container1.getInfo().getCapabilities();
 
-
             //Portlet 1 with VIEW, EDIT, HELP
             Set modeInfos = capaInfo.getModes("text/html");
 
@@ -107,7 +107,6 @@
             assertTrue(!portletModes.contains(Mode.EDIT));
 
 
-
          }
       });
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PortletInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.PreferencesInfo;
-import org.jboss.portal.portlet.info.PreferenceInfo;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
-import java.util.Locale;
-
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
@@ -83,7 +80,6 @@
             assertEquals(Boolean.TRUE, info.isRemotable());
 
 
-
          }
       });
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/PreferenceInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.AssertResult;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.info.MetaInfo;
-import org.jboss.portal.portlet.info.PreferencesInfo;
 import org.jboss.portal.portlet.info.PreferenceInfo;
+import org.jboss.portal.portlet.info.PreferencesInfo;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 import java.util.Locale;
 import java.util.Set;
-import java.util.List;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -90,28 +87,28 @@
             prefInfo = prefsInfo.getPreference("single_pref");
             assertEquals("single_pref", prefInfo.getKey());
             String[] values = prefInfo.getDefaultValue().asStringArray();
-            assertEquals(new String[] {"single_pref_value"}, values);
+            assertEquals(new String[]{"single_pref_value"}, values);
             assertTrue(!prefInfo.isReadOnly().booleanValue());
 
             //
             prefInfo = prefsInfo.getPreference("multi_pref");
             assertEquals("multi_pref", prefInfo.getKey());
             values = prefInfo.getDefaultValue().asStringArray();
-            assertEquals(new String[] {"multi_pref_value_1", "multi_pref_value_2"}, values);
+            assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values);
             assertTrue(!prefInfo.isReadOnly().booleanValue());
 
             //
             prefInfo = prefsInfo.getPreference("single_pref_bis");
             assertEquals("single_pref_bis", prefInfo.getKey());
             values = prefInfo.getDefaultValue().asStringArray();
-            assertEquals(new String[] {"single_pref_value"}, values);
+            assertEquals(new String[]{"single_pref_value"}, values);
             assertTrue(prefInfo.isReadOnly().booleanValue());
 
             //
             prefInfo = prefsInfo.getPreference("multi_pref_bis");
             assertEquals("multi_pref_bis", prefInfo.getKey());
             values = prefInfo.getDefaultValue().asStringArray();
-            assertEquals(new String[] {"multi_pref_value_1", "multi_pref_value_2"}, values);
+            assertEquals(new String[]{"multi_pref_value_1", "multi_pref_value_2"}, values);
             assertTrue(prefInfo.isReadOnly().booleanValue());
          }
       });

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.portlet.TransportGuarantee;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.info.SecurityInfo;
-import org.jboss.portal.portlet.TransportGuarantee;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -89,7 +90,6 @@
             assertTrue(secInfo.containsTransportGuarantee(TransportGuarantee.NONE));
 
 
-
          }
       });
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SessionInfoTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info;
 
-import org.jboss.portal.test.server.AbstractTest;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.portlet.container.PortletApplicationRegistry;
 import org.jboss.portal.portlet.container.PortletContainer;
 import org.jboss.portal.portlet.info.PortletInfo;
 import org.jboss.portal.portlet.info.SessionInfo;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.test.framework.container.result.AssertResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.server.AbstractTest;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/universal/SimplePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.info.universal;
 
 import javax.portlet.GenericPortlet;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionrequest/ActionRequestSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.actionrequest;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -48,10 +49,7 @@
    //********************************
 
    /**
-    * ActionRequest.BASIC_AUTH
-    * ActionRequest.CLIENT_CERT_AUTH
-    * ActionRequest.DIGEST_AUTH
-    * ActionRequest.FORM_AUTH
+    * ActionRequest.BASIC_AUTH ActionRequest.CLIENT_CERT_AUTH ActionRequest.DIGEST_AUTH ActionRequest.FORM_AUTH
     * ActionRequest.USER_INFO
     */
    public void createConstantsCase(SequenceRegistry registry)
@@ -73,10 +71,7 @@
       });
    }
 
-   /**
-    * ActionRequest.getProperty()
-    * ActionRequest.getProperties()
-    */
+   /** ActionRequest.getProperty() ActionRequest.getProperties() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -123,11 +118,7 @@
       });
    }
 
-   /**
-    * ActionRequest.getAttribute()
-    * ActionRequest.setAttribute()
-    * ActionRequest.removeAttribute()
-    */
+   /** ActionRequest.getAttribute() ActionRequest.setAttribute() ActionRequest.removeAttribute() */
    public void createAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -184,10 +175,7 @@
       });
    }
 
-   /**
-    * ActionRequest.getParameter()
-    * ActionRequest.getParameterValues()
-    */
+   /** ActionRequest.getParameter() ActionRequest.getParameterValues() */
    public void createParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -235,7 +223,4 @@
    }
 
 
-
-
-
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/actionresponse/ActionResponseSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.actionresponse;
 
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.EndTestResult;
 import org.jboss.portal.test.framework.container.result.InvokeGetResult;
 import org.jboss.portal.test.framework.container.result.Result;
@@ -47,11 +47,7 @@
 public class ActionResponseSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * ActionResponse.setRenderParameter()
-    * ActionResponse.setRenderParameter()
-    * ActionResponse.setRenderParameters()
-    */
+   /** ActionResponse.setRenderParameter() ActionResponse.setRenderParameter() ActionResponse.setRenderParameters() */
    public void createRenderParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -146,7 +142,7 @@
 
             Map map = new HashMap();
 
-            map.put("name","val");
+            map.put("name", "val");
             map.put(null, "val");
 
             try
@@ -202,10 +198,7 @@
    //PortletResponse methods:
    //************************
 
-   /**
-    * ActionResponse.setProperty()
-    * ActionResponse.addProperty()
-    */
+   /** ActionResponse.setProperty() ActionResponse.addProperty() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -252,9 +245,7 @@
       });
    }
 
-   /**
-    * ActionResponse.encodeURL()
-    */
+   /** ActionResponse.encodeURL() */
    public void createEncodeURLCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portalcontext;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -44,9 +45,7 @@
  */
 public class PortalContextSequenceBuilder extends SequenceRegistryBuilder
 {
-   /**
-    * PortalContext.getSupportedPortletModes()
-    */
+   /** PortalContext.getSupportedPortletModes() */
    public void createSupportedPortletModesCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -75,9 +74,7 @@
       });
    }
 
-   /**
-    * PortalContext.getSupportedWindowStates()
-    */
+   /** PortalContext.getSupportedWindowStates() */
    public void createSupportedWindowStatesCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -107,9 +104,7 @@
       });
    }
 
-   /**
-    * PortalContext.getPortalInfo()
-    */
+   /** PortalContext.getPortalInfo() */
    public void createPortalInfoCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -128,9 +123,7 @@
       });
    }
 
-   /**
-    * PortalContext.getProperty()
-    */
+   /** PortalContext.getProperty() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
 
 import junit.framework.Test;
@@ -62,7 +63,6 @@
       suite.addTest(new TestCase("InitParameterNames"));
 
 
-
       return suite;
    }
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletconfig;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -47,10 +48,7 @@
 public class PortletConfigSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * @portlet.api assert="PortletConfig.getPortletName()"
-    *
-    */
+   /** @portlet.api assert="PortletConfig.getPortletName()" */
    public void createPortletNameCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -63,16 +61,13 @@
             AbstractUniversalTestPortlet aport = (AbstractUniversalTestPortlet)portlet;
             PortletConfig config = aport.getPortletConfig();
             assertNotNull(config);
-            assertEquals("TestUniversalPortletA",config.getPortletName());
+            assertEquals("TestUniversalPortletA", config.getPortletName());
             return new EndTestResult();
          }
       });
    }
 
-   /**
-    * @portlet.api assert="PortletConfig.getPortletContext()"
-    *
-    */
+   /** @portlet.api assert="PortletConfig.getPortletContext()" */
    public void createPortletContextCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -95,10 +90,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="PortletConfig.getInitParameter()"
-    *
-    */
+   /** @portlet.api assert="PortletConfig.getInitParameter()" */
    public void createInitParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -113,13 +105,12 @@
             assertNotNull(config);
 
             //assert correct values
-            assertEquals("InitParamAValue",config.getInitParameter("InitParamA"));
-            assertEquals("InitParamBValue",config.getInitParameter("InitParamB"));
+            assertEquals("InitParamAValue", config.getInitParameter("InitParamA"));
+            assertEquals("InitParamBValue", config.getInitParameter("InitParamB"));
 
             //assert param not exists
             assertNull(config.getInitParameter("InitParamC"));
 
-
             //assert IllegalArgumentException when name is null
             try
             {
@@ -136,10 +127,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="PortletConfig.getInitParameterNames()"
-    *
-    */
+   /** @portlet.api assert="PortletConfig.getInitParameterNames()" */
    public void createInitParameterNamesCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -159,7 +147,6 @@
             //should be EMPTY
             assertTrue(!e.hasMoreElements());
 
-
             //we do nothing. response will be rendered by other portlet. If failed there will be
             //two results so whole test case will fail;
             return null;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletcontext;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -34,8 +35,8 @@
 import javax.portlet.Portlet;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import java.util.Set;
 import java.net.MalformedURLException;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -44,9 +45,7 @@
 public class PortletContextSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * PortletContext.getServerInfo()
-    */
+   /** PortletContext.getServerInfo() */
    public void createServerInfoCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -62,10 +61,7 @@
       });
    }
 
-   /**
-    * PortletContext.getRequestDispatcher()
-    * PortletContext.getNamedDispatcher()
-    */
+   /** PortletContext.getRequestDispatcher() PortletContext.getNamedDispatcher() */
    public void createDispatcherCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -85,10 +81,7 @@
       });
    }
 
-   /**
-    * PortletContext.getMinorVersion()
-    * PortletContext.getMajorVersion()
-    */
+   /** PortletContext.getMinorVersion() PortletContext.getMajorVersion() */
    public void createVersionCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -106,9 +99,7 @@
       });
    }
 
-   /**
-    * PortletContext.getMimeType()
-    */
+   /** PortletContext.getMimeType() */
    public void createMimeTypeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -125,9 +116,7 @@
       });
    }
 
-   /**
-    * PortletContext.getResourcePaths()
-    */
+   /** PortletContext.getResourcePaths() */
    public void createResourcePathsCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -149,9 +138,7 @@
       });
    }
 
-   /**
-    * PortletContext.getResource()
-    */
+   /** PortletContext.getResource() */
    public void createResourceCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -190,11 +177,7 @@
       });
    }
 
-   /**
-    * PortletContext.getAttribute()
-    * PortletContext.removeAttribute()
-    * PortletContext.setAttribute()
-    */
+   /** PortletContext.getAttribute() PortletContext.removeAttribute() PortletContext.setAttribute() */
    public void createAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -242,9 +225,7 @@
       });
    }
 
-   /**
-    * PortletContext.getInitParameter()
-    */
+   /** PortletContext.getInitParameter() */
    public void createInitParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -273,9 +254,7 @@
       });
    }
 
-   /**
-    * PortletContext.getPortletContextName()
-    */
+   /** PortletContext.getPortletContextName() */
    public void createPortletContextNameCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletmode;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletmode/PortletModeSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletmode;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -41,9 +42,7 @@
 public class PortletModeSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * @portlet.api assert="PortletMode.EDIT, PortletMode.HELP, PortletMode.VIEW"
-    */
+   /** @portlet.api assert="PortletMode.EDIT, PortletMode.HELP, PortletMode.VIEW" */
    public void createModesCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -61,9 +60,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="PortletMode.PortletMode()"
-    */
+   /** @portlet.api assert="PortletMode.PortletMode()" */
    public void createConstructorCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -83,9 +80,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="PortletConfig.equals()"
-    */
+   /** @portlet.api assert="PortletConfig.equals()" */
    public void createEqualsCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -109,9 +104,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="PortletConfig.hashCode()"
-    */
+   /** @portlet.api assert="PortletConfig.hashCode()" */
    public void createHashCodeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -130,9 +123,9 @@
             assertTrue(pm1.hashCode() != pm3.hashCode());
 
             //Hashcodes are constructed from strings
-            assertEquals("testmode".hashCode(), pm1.hashCode() );
-            assertEquals("testmode".hashCode(), pm2.hashCode() );
-            assertEquals("othermode".hashCode(), pm3.hashCode() );
+            assertEquals("testmode".hashCode(), pm1.hashCode());
+            assertEquals("testmode".hashCode(), pm2.hashCode());
+            assertEquals("othermode".hashCode(), pm3.hashCode());
 
 
             return new EndTestResult();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletpreferences/PortletPreferencesSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletpreferences;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -27,20 +28,20 @@
 import org.jboss.portal.test.framework.portlet.Sequence;
 import org.jboss.portal.test.framework.portlet.SequenceRegistry;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
+import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
 import org.jboss.portal.test.framework.portlet.universal.UTP2;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
 import javax.portlet.PortletPreferences;
+import javax.portlet.PortletURL;
 import javax.portlet.ReadOnlyException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 import javax.portlet.ValidatorException;
-import javax.portlet.PortletURL;
 import java.io.IOException;
 
 /**
@@ -50,9 +51,7 @@
 public class PortletPreferencesSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * PortletPreferences.isReadOnly()
-    */
+   /** PortletPreferences.isReadOnly() */
    public void createReadOnlyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -77,9 +76,7 @@
    }
 
    /**
-    * PortletPreferences.getValue()
-    * PortletPreferences.getValues()
-    * PortletPreferences.setValue()
+    * PortletPreferences.getValue() PortletPreferences.getValues() PortletPreferences.setValue()
     * PortletPreferences.setValues()
     */
    public void createValueCase(SequenceRegistry registry)
@@ -196,9 +193,7 @@
       });
    }
 
-   /**
-    * PortletPreferences.reset()
-    */
+   /** PortletPreferences.reset() */
    public void createResetNullKeyThrowsNPE(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletsession;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletsession;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -41,10 +42,7 @@
 public class PortletSessionSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * PortletSession.APPLICATION_SCOPE
-    * PortletSession.PORTLET_SCOPE
-    */
+   /** PortletSession.APPLICATION_SCOPE PortletSession.PORTLET_SCOPE */
    public void createConstantsCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -60,9 +58,7 @@
       });
    }
 
-   /**
-    * PortletSession.getAttribute()
-    */
+   /** PortletSession.getAttribute() */
    public void createGetAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -119,9 +115,7 @@
       });
    }
 
-   /**
-    * PortletSession.getAttributeNames()
-    */
+   /** PortletSession.getAttributeNames() */
    public void createAttributeNamesCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -163,9 +157,7 @@
       });
    }
 
-   /**
-    * PortletSession.getCreationTime()
-    */
+   /** PortletSession.getCreationTime() */
    public void createCreationTimeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -195,9 +187,7 @@
       });
    }
 
-   /**
-    * PortletSession.invalidate()
-    */
+   /** PortletSession.invalidate() */
    public void createInvalidateCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -225,9 +215,7 @@
       });
    }
 
-   /**
-    * PortletSession.isNew()
-    */
+   /** PortletSession.isNew() */
    public void createNewCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -257,9 +245,7 @@
       });
    }
 
-   /**
-    * PortletSession.removeAttribute()
-    */
+   /** PortletSession.removeAttribute() */
    public void createRemoveAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -319,9 +305,7 @@
       });
    }
 
-   /**
-    * PortletSession.setAttribute()
-    */
+   /** PortletSession.setAttribute() */
    public void createSetAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -381,6 +365,4 @@
    }
 
 
-
-
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletsessionutil/PortletSessionUtilSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portletsessionutil;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portleturl;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portleturl/PortletURLSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.portleturl;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -43,11 +44,7 @@
 public class PortletURLSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * PortletURL.setParameter()
-    * PortletURL.setParameter()
-    * PortletURL.setParameters()
-    */
+   /** PortletURL.setParameter() PortletURL.setParameter() PortletURL.setParameters() */
    public void createParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -134,7 +131,7 @@
 
             Map map = new HashMap();
 
-            map.put("name","val");
+            map.put("name", "val");
             map.put(null, "val");
 
             try

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderrequest/RenderRequestSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.renderrequest;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -44,10 +45,7 @@
    //********************************
 
    /**
-    * RenderRequest.BASIC_AUTH
-    * RenderRequest.CLIENT_CERT_AUTH
-    * RenderRequest.DIGEST_AUTH
-    * RenderRequest.FORM_AUTH
+    * RenderRequest.BASIC_AUTH RenderRequest.CLIENT_CERT_AUTH RenderRequest.DIGEST_AUTH RenderRequest.FORM_AUTH
     * RenderRequest.USER_INFO
     */
    public void createConstantsCase(SequenceRegistry registry)
@@ -69,10 +67,7 @@
       });
    }
 
-   /**
-    * RenderRequest.getProperty()
-    * RenderRequest.getProperties()
-    */
+   /** RenderRequest.getProperty() RenderRequest.getProperties() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -105,11 +100,7 @@
       });
    }
 
-   /**
-    * RenderRequest.getAttribute()
-    * RenderRequest.setAttribute()
-    * RenderRequest.removeAttribute()
-    */
+   /** RenderRequest.getAttribute() RenderRequest.setAttribute() RenderRequest.removeAttribute() */
    public void createAttributeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -150,10 +141,7 @@
       });
    }
 
-   /**
-    * RenderRequest.getParameter()
-    * RenderRequest.getParameterValues()
-    */
+   /** RenderRequest.getParameter() RenderRequest.getParameterValues() */
    public void createParameterCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/renderresponse/RenderResponseSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.renderresponse;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -40,9 +41,7 @@
 public class RenderResponseSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * RenderResponse.EXPIRATION_CACHE
-    */
+   /** RenderResponse.EXPIRATION_CACHE */
    public void createConstantsCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -57,9 +56,7 @@
       });
    }
 
-   /**
-    * RenderResponse.setContentType()
-    */
+   /** RenderResponse.setContentType() */
    public void createContentTypeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -82,15 +79,11 @@
       });
    }
 
-
    //************************
    //PortletResponse methods:
    //************************
 
-   /**
-    * RenderResponse.setProperty()
-    * RenderResponse.addProperty()
-    */
+   /** RenderResponse.setProperty() RenderResponse.addProperty() */
    public void createPropertyCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -122,9 +115,7 @@
       });
    }
 
-   /**
-    * RenderResponse.encodeURL()
-    */
+   /** RenderResponse.encodeURL() */
    public void createEncodeURLCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateAPITestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.windowstate;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/windowstate/WindowStateSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.api.windowstate;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -41,9 +42,7 @@
 public class WindowStateSequenceBuilder extends SequenceRegistryBuilder
 {
 
-   /**
-    * @portlet.api assert="WindowState.MINIMIZED WindowState.MAXIMIZED WindowState.NORMAL"
-    */
+   /** @portlet.api assert="WindowState.MINIMIZED WindowState.MAXIMIZED WindowState.NORMAL" */
    public void createStatesCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -61,9 +60,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="WindowState.WindowState()"
-    */
+   /** @portlet.api assert="WindowState.WindowState()" */
    public void createConstructorCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -83,9 +80,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="WindowState.equals()"
-    */
+   /** @portlet.api assert="WindowState.equals()" */
    public void createEqualsCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -109,9 +104,7 @@
       });
    }
 
-   /**
-    * @portlet.api assert="WindowState.hashCode()"
-    */
+   /** @portlet.api assert="WindowState.hashCode()" */
    public void createHashCodeCase(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();
@@ -130,9 +123,9 @@
             assertTrue(ws1.hashCode() != ws3.hashCode());
 
             //Hashcodes are constructed from strings
-            assertEquals("teststate".hashCode(), ws1.hashCode() );
-            assertEquals("teststate".hashCode(), ws2.hashCode() );
-            assertEquals("otherstate".hashCode(), ws3.hashCode() );
+            assertEquals("teststate".hashCode(), ws1.hashCode());
+            assertEquals("teststate".hashCode(), ws2.hashCode());
+            assertEquals("otherstate".hashCode(), ws3.hashCode());
 
 
             return new EndTestResult();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
 import org.jboss.portal.test.framework.portlet.universal.UTS1;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.common.util.Tools;
 
 import javax.portlet.Portlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletException;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -83,9 +84,7 @@
       });
    }
 
-   /**
-    * Show that we can access request headers from the portlet request properties.
-    */
+   /** Show that we can access request headers from the portlet request properties. */
    public void createRequestHeaderAccess(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.dispatcher;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet;
 import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundleCascadePortlet;
 import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet;
-import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet;
-import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesWithNoResourceBundleDefinedPortlet;
 
 import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletConfig;
-import java.util.ResourceBundle;
 import java.util.Locale;
 import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -67,7 +66,6 @@
    }
 
 
-
    public void createResourceBundleCascade(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/PortletConfigTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletconfig;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/GetResourceBundleDuringInitPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundleCascadePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletconfig/extended/ResourceBundlePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,46 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
 
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
-import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
+import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
 import org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended.TestActionWithPortletModePortlet;
 
-
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletModeException;
+import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletModeException;
-import javax.portlet.PortletURL;
-import javax.portlet.PortletMode;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/PortletModeTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletmode;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletmode/extended/TestActionWithPortletModePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletmode.extended;
 
+import org.jboss.portal.test.framework.portlet.Joinpoint;
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
-public class  PortletRequestTestSuite
+public class PortletRequestTestSuite
 {
    public static Test suite()
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,55 +1,56 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletrequests;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.InvokePostResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
-import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
+import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.InvokePostResult;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.common.util.Tools;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
+import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.Reader;
 import java.io.StringWriter;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
+import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Enumeration;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -61,9 +62,8 @@
    private final byte[] byteContent = {65, 66, 67, 68, 69, 70};
 
    /**
-    * Test that a POST request having a content type set to x-www-form-urlencoded will
-    * make the body content unavailable as an input stream or a reader and the parameters
-    * are decoded.
+    * Test that a POST request having a content type set to x-www-form-urlencoded will make the body content unavailable
+    * as an input stream or a reader and the parameters are decoded.
     */
    public void createActionRequestUseFormCase(SequenceRegistry registry)
    {
@@ -132,8 +132,8 @@
    }
 
    /**
-    * Test that a POST request having a content type not set to x-www-form-urlencoded will
-    * make the body content available as an input stream.
+    * Test that a POST request having a content type not set to x-www-form-urlencoded will make the body content
+    * available as an input stream.
     */
    public void createActionRequestUseInputStreamCase(SequenceRegistry registry)
    {
@@ -211,8 +211,8 @@
    }
 
    /**
-    * Test that a POST request having a content type not set to x-www-form-urlencoded will
-    * make the body content available as a reader.
+    * Test that a POST request having a content type not set to x-www-form-urlencoded will make the body content
+    * available as a reader.
     */
    public void createActionRequestUseReaderCase(SequenceRegistry registry)
    {
@@ -287,8 +287,8 @@
    }
 
    /**
-    * This case works with two portlets involved in the same render request.
-    * To pass the test, the assert result of the two portlets must pass.
+    * This case works with two portlets involved in the same render request. To pass the test, the assert result of the
+    * two portlets must pass.
     */
    public void createRequestAttributeCase(SequenceRegistry registry)
    {
@@ -322,8 +322,8 @@
    }
 
    /**
-    * This case works with two portlets involved in the same render request.
-    * To pass the test, the assert result of the two portlets must pass.
+    * This case works with two portlets involved in the same render request. To pass the test, the assert result of the
+    * two portlets must pass.
     */
    public void createRequestAttributeScopingCase(SequenceRegistry registry)
    {
@@ -393,10 +393,8 @@
       });
    }
 
-   
-   /**
-    * Show that we can access request headers from the portlet request properties.
-    */
+
+   /** Show that we can access request headers from the portlet request properties. */
    public void createRequestHeaderAccess(SequenceRegistry registry)
    {
       Sequence seq = new Sequence();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,61 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletresponses;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
-import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
-import org.jboss.portal.test.framework.portlet.universal.UTS1;
-import org.jboss.portal.test.framework.portlet.universal.UTS2;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.test.framework.container.result.AssertResult;
-import org.jboss.portal.test.framework.container.result.FailureResult;
-import org.jboss.portal.test.portlet.jsr168.tck.portletresponses.*;
 
 import javax.portlet.Portlet;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletModeException;
-import javax.portlet.PortletMode;
-import javax.portlet.WindowStateException;
-import javax.portlet.WindowState;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -83,6 +60,5 @@
       });
    }
 
-   
 
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/portletresponses/PortletResponsesTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.portletresponses;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,48 +1,48 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.preferences;
 
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
-import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
 import org.jboss.portal.test.framework.portlet.universal.UTP2;
 import org.jboss.portal.test.framework.portlet.universal.UTP3;
 import org.jboss.portal.test.framework.portlet.universal.UTP4;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
 
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletURL;
+import javax.portlet.ReadOnlyException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletURL;
-import javax.portlet.ActionResponse;
-import javax.portlet.ActionRequest;
 import javax.portlet.ValidatorException;
-import javax.portlet.ReadOnlyException;
-import javax.portlet.PortletPreferences;
 import java.io.IOException;
 import java.util.Map;
 
@@ -55,6 +55,7 @@
 
    /**
     * Asserts that isReadOnly() returns correct values during both render and action phase
+    *
     * @param registry
     */
    public void createIsReadOnlyCase(SequenceRegistry registry)

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/preferences/PreferencesTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.preferences;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
@@ -45,7 +46,6 @@
       suite.addTest(new TestCase("StoreMustPersistAllChanges"));
       suite.addTest(new TestCase("Map"));
 
-
       //
       return suite;
    }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,47 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.session;
 
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.InvokeGetResult;
+import org.jboss.portal.test.framework.container.result.Result;
+import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
-import org.jboss.portal.test.framework.portlet.Sequence;
+import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
-import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
 import org.jboss.portal.test.framework.portlet.universal.UTS1;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
 
-import javax.portlet.Portlet;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.PortletSession;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
 import javax.portlet.PortletException;
 import javax.portlet.PortletSecurityException;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -119,12 +120,11 @@
    }
 
    /**
-    * The goal is to test that cross context session attributes are set in container
-    * and are accessible from the direct servlet.
+    * The goal is to test that cross context session attributes are set in container and are accessible from the direct
+    * servlet.
     * <p/>
-    * 1/ portlet put key=value in the http session
-    * 2/ portlet ask the client to perform get on /servlet
-    * 3/ servlet check that key=value
+    * 1/ portlet put key=value in the http session 2/ portlet ask the client to perform get on /servlet 3/ servlet check
+    * that key=value
     */
    public void createCrossContextSessionAttributeCase(SequenceRegistry registry)
    {
@@ -159,5 +159,5 @@
 
 
    }
-   
+
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/session/SessionTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.ext.session;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLogger.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.misc.log4j;
 
 import org.apache.log4j.Logger;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/CustomLoggerFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.misc.log4j;
 
+import org.apache.log4j.Logger;
 import org.apache.log4j.spi.LoggerFactory;
-import org.apache.log4j.Logger;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -36,6 +37,6 @@
 
    public Logger makeNewLoggerInstance(String name)
    {
-       return new CustomLogger(name);
+      return new CustomLogger(name);
    }
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.misc.log4j;
 
-import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.apache.log4j.Logger;
+import org.jboss.portal.test.framework.container.result.EndTestResult;
+import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
-import org.jboss.portal.test.framework.portlet.universal.UTP1;
+import org.jboss.portal.test.framework.portlet.SequenceRegistry;
+import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.result.EndTestResult;
-import org.apache.log4j.spi.LoggerRepository;
-import org.apache.log4j.Logger;
 
 import javax.portlet.Portlet;
 import javax.portlet.RenderRequest;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/Log4jTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.misc.log4j;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/misc/log4j/LoggingPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.misc.log4j;
 
+import org.apache.log4j.Logger;
+import org.jboss.portal.test.framework.portlet.Joinpoint;
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.framework.portlet.Joinpoint;
-import org.apache.log4j.Logger;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -62,12 +63,12 @@
    public static final String SERVLET_B_URI = "/test-jsr168-dispatcher/universalServletB";
 
    /**
-    * @portlet.specification assert="SPEC:121 - The getRequestDispatcher method takes a
-    * String argument describing a path within the scope of the PortletContext of a portlet
-    * application. This path must begin with a ‘/’ and it is relative to the PortletContext root."
-    * @portlet.specification assert="SPEC:122 - The getNamedDispatcher method takes a String
-    * argument indicating the name of a servlet known to the PortletContext of the portlet application.
-    * If no resource can be resolved based on the given path or name the methods must return null"
+    * @portlet.specification assert="SPEC:121 - The getRequestDispatcher method takes a String argument describing a
+    * path within the scope of the PortletContext of a portlet application. This path must begin with a ‘/’ and it is
+    * relative to the PortletContext root."
+    * @portlet.specification assert="SPEC:122 - The getNamedDispatcher method takes a String argument indicating the
+    * name of a servlet known to the PortletContext of the portlet application. If no resource can be resolved based on
+    * the given path or name the methods must return null"
     */
    public void createObtainingDispatcherCase(SequenceRegistry registry)
    {
@@ -119,8 +120,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:123 - The parameters associated with a
-    * PortletRequestDispatcher are scoped to apply only for the duration of the include call."
+    * @portlet.specification assert="SPEC:123 - The parameters associated with a PortletRequestDispatcher are scoped to
+    * apply only for the duration of the include call."
     */
    public void createQueryStringInRequestDispatcherCase(SequenceRegistry registry)
    {
@@ -176,15 +177,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:124 - To include a servlet or a JSP, a portlet
-    * calls the include method
-    * of the PortletRequestDispatcher interface. The parameters to these methods must
-    * be the request and response arguments that were passed in via the render method
-    * of the Portlet interface."
-    * @portlet.specification assert="SPEC:125 - The portlet container must ensure
-    * that the servlet or
-    * JSP called through a PortletRequestDispatcher is called in the same thread as
-    * the PortletRequestDispatcher include invocation."
+    * @portlet.specification assert="SPEC:124 - To include a servlet or a JSP, a portlet calls the include method of the
+    * PortletRequestDispatcher interface. The parameters to these methods must be the request and response arguments
+    * that were passed in via the render method of the Portlet interface."
+    * @portlet.specification assert="SPEC:125 - The portlet container must ensure that the servlet or JSP called through
+    * a PortletRequestDispatcher is called in the same thread as the PortletRequestDispatcher include invocation."
     */
    public void createDispatchedRequestCase(SequenceRegistry registry)
    {
@@ -224,8 +221,8 @@
 
 
    /**
-    * @portlet.specification assert="SPEC:126 - Servlets and JSPs included from portlets must be
-    * handled as HTTP GET requests."
+    * @portlet.specification assert="SPEC:126 - Servlets and JSPs included from portlets must be handled as HTTP GET
+    * requests."
     */
    public void createGETMethodCase(SequenceRegistry registry)
    {
@@ -262,11 +259,10 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:127 - Except for servlets obtained by using the getNamedDispatcher method,
-    * a servlet or JSP being used from within an include call has access to the path
-    * used to obtain the PortletRequestDispatcher. The following request attributes
-    * must be set: javax.servlet.include.request_uri, javax.servlet.include.context_path
-    * javax.servlet.include.servlet_path, javax.servlet.include.path_info,
+    * @portlet.specification assert="SPEC:127 - Except for servlets obtained by using the getNamedDispatcher method, a
+    * servlet or JSP being used from within an include call has access to the path used to obtain the
+    * PortletRequestDispatcher. The following request attributes must be set: javax.servlet.include.request_uri,
+    * javax.servlet.include.context_path javax.servlet.include.servlet_path, javax.servlet.include.path_info,
     * javax.servlet.include.query_string"
     */
    public void createIncludedRequestParametersCase(SequenceRegistry registry)
@@ -368,10 +364,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:128 - javax.portlet.config,
-    * javax.portlet.request, javax.portlet.response.
-    * These attributes must be the same Portlet API objects accessible to the portlet
-    * doing the include call."
+    * @portlet.specification assert="SPEC:128 - javax.portlet.config, javax.portlet.request, javax.portlet.response.
+    * These attributes must be the same Portlet API objects accessible to the portlet doing the include call."
     */
    public void createIncludedRequestAttributesCase(SequenceRegistry registry)
    {
@@ -432,25 +426,23 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:129 - The following methods of the HttpServletRequest must return null: getProtocol,
-    * getRemoteAddr, getRemoteHost, getRealPath, and getRequestURL."
+    * @portlet.specification assert="SPEC:129 - The following methods of the HttpServletRequest must return null:
+    * getProtocol, getRemoteAddr, getRemoteHost, getRealPath, and getRequestURL."
     * @portlet.specification assert="SPEC:130 - The following methods of the HttpServletRequest must return the path and
-    * query string information used to obtain the PortletRequestDispatcher object: getPathInfo,
-    * getPathTranslated, getQueryString, getRequestURI and getServletPath"
-    * @portlet.specification assert="SPEC:131 - The following methods of the HttpServletRequest must be equivalent to the
-    * methods of the PortletRequest of similar name: getScheme, getServerName,getServerPort,
-    * getAttribute, getAttributeNames, setAttribute,removeAttribute, getLocale, getLocales,
-    * isSecure, getAuthType, getContextPath, getRemoteUser, getUserPrincipal,
-    * getRequestedSessionId, isRequestedSessionIdValid"
-    * @portlet.specification assert="SPEC:132 - The following methods of the HttpServletRequest must be equivalent to the
-    * methods of the PortletRequest of similar name with the provision defined in PLT.16.1.1
-    * Query Strings in Request Dispatcher Paths Section: getParameter, getParameterNames,
-    * getParameterValues and getParameterMap."
-    * @portlet.specification assert="SPEC:133 - The following methods of the HttpServletRequest must do no operations and
-    * return null: getCharacterEncoding, setCharacterEncoding, getContentType, getInputStream
-    * and getReader."
+    * query string information used to obtain the PortletRequestDispatcher object: getPathInfo, getPathTranslated,
+    * getQueryString, getRequestURI and getServletPath"
+    * @portlet.specification assert="SPEC:131 - The following methods of the HttpServletRequest must be equivalent to
+    * the methods of the PortletRequest of similar name: getScheme, getServerName,getServerPort, getAttribute,
+    * getAttributeNames, setAttribute,removeAttribute, getLocale, getLocales, isSecure, getAuthType, getContextPath,
+    * getRemoteUser, getUserPrincipal, getRequestedSessionId, isRequestedSessionIdValid"
+    * @portlet.specification assert="SPEC:132 - The following methods of the HttpServletRequest must be equivalent to
+    * the methods of the PortletRequest of similar name with the provision defined in PLT.16.1.1 Query Strings in
+    * Request Dispatcher Paths Section: getParameter, getParameterNames, getParameterValues and getParameterMap."
+    * @portlet.specification assert="SPEC:133 - The following methods of the HttpServletRequest must do no operations
+    * and return null: getCharacterEncoding, setCharacterEncoding, getContentType, getInputStream and getReader."
     * @portlet.specification assert="SPEC:134 - The getContentLength method of the HttpServletRequest must return 0."
-    * @portlet.specification assert="SPEC:137 - The getMethod method of the HttpServletRequest must always return ‘GET’"
+    * @portlet.specification assert="SPEC:137 - The getMethod method of the HttpServletRequest must always return
+    * ‘GET’"
     */
    public void createRequestObjectCase(SequenceRegistry registry)
    {
@@ -578,10 +570,10 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:138 - The following methods of the HttpServletResponse must
-    * return null:encodeRedirectURL and encodeRedirectUrl"
-    * @portlet.specification assert="SPEC:141 - The getLocale method of the HttpServletResponse must be based
-    * on the getLocale method of the RenderResponse."
+    * @portlet.specification assert="SPEC:138 - The following methods of the HttpServletResponse must return
+    * null:encodeRedirectURL and encodeRedirectUrl"
+    * @portlet.specification assert="SPEC:141 - The getLocale method of the HttpServletResponse must be based on the
+    * getLocale method of the RenderResponse."
     */
    public void createResponseObjectCase(SequenceRegistry registry)
    {
@@ -624,12 +616,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:142 - If the servlet or JSP that is the target of a request dispatcher
-    * throws a runtime exception or a checked exception of type IOException, it
-    * must be propagated to the calling portlet."
-    * @portlet.specification assert="SPEC:143 - All other exceptions, including a ServletException, must be wrapped
-    * with a PortletException. The root cause of the exception must be set to the
-    * original exception before being propagated."
+    * @portlet.specification assert="SPEC:142 - If the servlet or JSP that is the target of a request dispatcher throws
+    * a runtime exception or a checked exception of type IOException, it must be propagated to the calling portlet."
+    * @portlet.specification assert="SPEC:143 - All other exceptions, including a ServletException, must be wrapped with
+    * a PortletException. The root cause of the exception must be set to the original exception before being
+    * propagated."
     */
    public void createErrorHandlingCase(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/dispatcher/DispatcherTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.dispatcher;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletconfig;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -28,9 +29,6 @@
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
-import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.GetResourceBundleDuringInitPortlet;
-import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundleCascadePortlet;
-import org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet;
 import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet;
 import org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesWithNoResourceBundleDefinedPortlet;
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/PortletConfigTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletconfig;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesNotInResourceBundlePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 
 /**
- * @portlet.specification
- *    assert="SPEC:24 - "If the portlet definition defines a resource bundle,
- *            the portlet-container must look up these values in the ResourceBundle.
- *            If the root resource bundle does not contain the resources for these
- *            values and the values are defined inline, the portlet container must
- *            add the inline values as resources of the root resource bundle.(xxi)"
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:24 - "If the portlet definition defines a resource bundle, the portlet-container
+ * must look up these values in the ResourceBundle. If the root resource bundle does not contain the resources for these
+ * values and the values are defined inline, the portlet container must add the inline values as resources of the root
+ * resource bundle.(xxi)"
  */
 public class InlineValuesNotInResourceBundlePortlet extends AbstractUniversalTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletconfig/spec/InlineValuesWithNoResourceBundleDefinedPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
 import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 
 /**
- * @portlet.specification
- *    assert="SPEC:25 - "If the portlet definition does not define a resource bundle
- *            and the information is defined inline in the deployment descriptor, the
- *            portlet container must create a ResourceBundle and populate it, with the
- *            inline values, using the keys defined in the PLT.21.10 Resource Bundles
- *            Section.(xxv)"
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.com">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:25 - "If the portlet definition does not define a resource bundle and the
+ * information is defined inline in the deployment descriptor, the portlet container must create a ResourceBundle and
+ * populate it, with the inline values, using the keys defined in the PLT.21.10 Resource Bundles Section.(xxv)"
  */
 public class InlineValuesWithNoResourceBundleDefinedPortlet extends AbstractUniversalTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -60,9 +61,8 @@
 
 
    /**
-    * @portlet.specification assert="SPEC:43 - The initialization parameters accessible through the PortletContext
-    * must be the same that are accessible through the ServletContext of the portlet
-    * application."
+    * @portlet.specification assert="SPEC:43 - The initialization parameters accessible through the PortletContext must
+    * be the same that are accessible through the ServletContext of the portlet application."
     */
    public void createInitializationParametersCase(SequenceRegistry registry)
    {
@@ -109,11 +109,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:44 - Context attributes set using the PortletContext must be
-    * stored in the ServletContext of the portlet application. A direct
-    * consequence of this is that data stored in the ServletContext by
-    * servlets or JSPs is accessible to portlets through the PortletContext
-    * and vice versa."
+    * @portlet.specification assert="SPEC:44 - Context attributes set using the PortletContext must be stored in the
+    * ServletContext of the portlet application. A direct consequence of this is that data stored in the ServletContext
+    * by servlets or JSPs is accessible to portlets through the PortletContext and vice versa."
     */
    public void createContextAttributesCase(SequenceRegistry registry)
    {
@@ -161,8 +159,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:45 - The PortletContext must offer access to the same set of
-    * resources the ServletContext exposes."
+    * @portlet.specification assert="SPEC:45 - The PortletContext must offer access to the same set of resources the
+    * ServletContext exposes."
     */
    public void createAccessSameSetOfResourcesCase(SequenceRegistry registry)
    {
@@ -232,10 +230,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:46 - The PortletContext must handle the same temporary working
-    * directory the ServletContext handles. It must be accessible as a context
-    * attribute using the same constant defined in the Servlet Specification
-    * 2.3 SVR 3 Servlet Context Chapter, javax.servlet.context.tempdir."
+    * @portlet.specification assert="SPEC:46 - The PortletContext must handle the same temporary working directory the
+    * ServletContext handles. It must be accessible as a context attribute using the same constant defined in the
+    * Servlet Specification 2.3 SVR 3 Servlet Context Chapter, javax.servlet.context.tempdir."
     */
    public void createTempDirCase(SequenceRegistry registry)
    {
@@ -285,9 +282,7 @@
    }
 
 
-   /**
-    * Simple compare of two Enumerationss
-    */
+   /** Simple compare of two Enumerationss */
    private boolean compare(Enumeration a, Enumeration b)
    {
       List al = new ArrayList();

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletcontext/PortletContextTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletcontext;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -60,8 +61,8 @@
 {
 
    /**
-    * @portlet.specification assert="SPEC:4 - After the portlet object is instantiated, the portlet
-    * container must initialize the portlet before invoking it to handle requests"
+    * @portlet.specification assert="SPEC:4 - After the portlet object is instantiated, the portlet container must
+    * initialize the portlet before invoking it to handle requests"
     */
    public void createInitializeBeforeHandleCase(SequenceRegistry registry)
    {
@@ -79,12 +80,12 @@
 
    /**
     * @portlet.specification assert="SPEC:5 - During initialization, the portlet object may throw an
-    * UnavailableException or a PortletException. In this case, the portlet container must not place
-    * the portlet object into active service and it must release the portlet object."
-    * @portlet.specification assert="SPEC:6 - The destroy method must not be called because the
-    * initialization is considered unsuccessful."
-    * @portlet.specification assert="SPEC:8 - A RuntimeException thrown during initialization must
-    * be handled as a PortletException."
+    * UnavailableException or a PortletException. In this case, the portlet container must not place the portlet object
+    * into active service and it must release the portlet object."
+    * @portlet.specification assert="SPEC:6 - The destroy method must not be called because the initialization is
+    * considered unsuccessful."
+    * @portlet.specification assert="SPEC:8 - A RuntimeException thrown during initialization must be handled as a
+    * PortletException."
     */
    public void createExceptionsOnInitCase(SequenceRegistry registry)
    {
@@ -157,9 +158,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:9 - If the client request is triggered by an
-    * action URL, the portal/portlet-container must first trigger the action request by invoking
-    * the processAction method of the targeted portlet."
+    * @portlet.specification assert="SPEC:9 - If the client request is triggered by an action URL, the
+    * portal/portlet-container must first trigger the action request by invoking the processAction method of the
+    * targeted portlet."
     */
    public void createInvokeActionFirstCase(SequenceRegistry registry)
    {
@@ -194,11 +195,9 @@
 
 
    /**
-    * @portlet.specification assert="SPEC:10 - The portal/portlet-container must wait
-    * until the action request finishes. Then, the portal/portlet-container must trigger
-    * the render request by invoking the render method for all the portlets
-    * in the portal page with the possible exception of portlets for which
-    * their content is being cached."
+    * @portlet.specification assert="SPEC:10 - The portal/portlet-container must wait until the action request finishes.
+    * Then, the portal/portlet-container must trigger the render request by invoking the render method for all the
+    * portlets in the portal page with the possible exception of portlets for which their content is being cached."
     */
    public void createInvokeRenderAfterActionURLCase(SequenceRegistry registry)
    {
@@ -273,10 +272,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:11 - If the client request is triggered by a render URL,
-    * the portal/portlet-container must invoke the render method for
-    * all the portlets in the portal page with the possible exception
-    * of portlets for which their content is being cached."
+    * @portlet.specification assert="SPEC:11 - If the client request is triggered by a render URL, the
+    * portal/portlet-container must invoke the render method for all the portlets in the portal page with the possible
+    * exception of portlets for which their content is being cached."
     */
    public void createInvokeRenderAfterRenderURLCase(SequenceRegistry registry)
    {
@@ -321,11 +319,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:12 - While processing an action request,
-    * the portlet may instruct
-    * the portal/portlet-container to redirect the user to a specific URL. If the
-    * portlet issues a redirection, when the processAction method concludes, the
-    * portal/portlet-container must send the redirection back to the user agent"
+    * @portlet.specification assert="SPEC:12 - While processing an action request, the portlet may instruct the
+    * portal/portlet-container to redirect the user to a specific URL. If the portlet issues a redirection, when the
+    * processAction method concludes, the portal/portlet-container must send the redirection back to the user agent"
     */
    public void createSendRedirectDuringActionCase(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface;
 
 import junit.framework.Test;
@@ -35,7 +36,6 @@
    {
       TestSuite suite = new TestSuite("test-jsr168-portletinterface.war");
 
-
       //SPEC:4 Testable=true Section=PLT.5.2.2
       suite.addTest(new TestCase("InitializeBeforeHandle"));
 
@@ -65,7 +65,7 @@
        */
       suite.addTest(new TestCase("InvokeRenderAfterActionURL"));
 
-       /**
+      /**
        * SPEC:11 Testable=true Section=PLT 5.2.4
        */
       suite.addTest(new TestCase("InvokeRenderAfterRenderURL"));
@@ -108,7 +108,6 @@
       /////suite.addTest(new PortletTestCase("ExceptionsDuringRequestHandlingPortlet"));
 
 
-
       return suite;
    }
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -36,26 +37,17 @@
 /**
  * DISABLED - NOT CURRENTLY USED TEST CASE
  *
- * @portlet.specification
- *    assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
- *            of the request and that the portlet container should take appropriate measures to clean
- *            up the request. If a portlet throws an exception in the processAction method, all
- *            operations on the ActionResponse must be ignored and the render method must not be
- *            invoked within the current client request"
- *
- * @portlet.specification
- *    assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException,
- *            the portlet container must remove the portlet from service immediately, call the
- *            portlet’s destroy method, and release the portlet object."
- *
- * @portlet.specification
- *    assert="SPEC:19 - "A RuntimeException thrown during the request handling must be handled
- *            as a PortletException"
- *
- *
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
+ * of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet
+ * throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render
+ * method must not be invoked within the current client request"
+ * @portlet.specification assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException, the
+ * portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release
+ * the portlet object."
+ * @portlet.specification assert="SPEC:19 - "A RuntimeException thrown during the request handling must be handled as a
+ * PortletException"
  */
 public class ExceptionsDuringRequestHandlingControllerPortlet extends AbstractTestPortlet
 {
@@ -102,7 +94,8 @@
       else if (TestCaseContext.isCurrentRequestCount(5))
       {
          AssertResult ares = new AssertResult();
-         ares.execute(new AssertResult.Test() {
+         ares.execute(new AssertResult.Test()
+         {
             public void run() throws Exception
             {
                //portlets that shouldn't render itself after Exception in Action Phase

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/InitializeBeforeHandlePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -27,12 +28,10 @@
 import javax.portlet.PortletConfig;
 
 /**
- *  @portlet.specification
- *    assert="SPEC:4 - After the portlet object is instantiated, the portlet container must initialize
- *    the portlet before invoking it to handle requests"
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:4 - After the portlet object is instantiated, the portlet container must
+ * initialize the portlet before invoking it to handle requests"
  */
 public class InitializeBeforeHandlePortlet extends AbstractUniversalTestPortlet
 {
@@ -46,6 +45,6 @@
 
    public void init(PortletConfig config)
    {
-       init = true;
+      init = true;
    }
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/MinimizedStateDontRenderPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -38,13 +39,10 @@
 import java.io.IOException;
 
 /**
- * @portlet.specification
- *    assert="SPEC:16 - If the window state of the portlet (see PLT.9 Window States Chapter)
- *            is MINIMIZED, the render method of the GenericPortlet does not invoke any
- *            of the portlet mode rendering methods"
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:16 - If the window state of the portlet (see PLT.9 Window States Chapter) is
+ * MINIMIZED, the render method of the GenericPortlet does not invoke any of the portlet mode rendering methods"
  */
 public class MinimizedStateDontRenderPortlet extends AbstractTestGenericPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringInitPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -28,17 +29,13 @@
 import javax.portlet.PortletException;
 
 /**
- * @portlet.specification
- *    assert="SPEC:5 - During initialization, the portlet object may throw an UnavailableException
- *           or a PortletException. In this case, the portlet container must not place the portlet object
- *           into active service and it must release the portlet object."
- *
- * @portlet.specification
- *    assert="SPEC:6 - The destroy method must not be called because the initialization is
- *           considered unsuccessful."
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:5 - During initialization, the portlet object may throw an UnavailableException
+ * or a PortletException. In this case, the portlet container must not place the portlet object into active service and
+ * it must release the portlet object."
+ * @portlet.specification assert="SPEC:6 - The destroy method must not be called because the initialization is
+ * considered unsuccessful."
  */
 public class PortletExceptionDuringInitPortlet extends AbstractUniversalTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -36,16 +37,12 @@
 /**
  * DISABLED - NOT CURRENTLY USED TEST CASE
  *
- * @portlet.specification
- *    assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
- *            of the request and that the portlet container should take appropriate measures to clean
- *            up the request. If a portlet throws an exception in the processAction method, all
- *            operations on the ActionResponse must be ignored and the render method must not be
- *            invoked within the current client request"
- *
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
+ * of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet
+ * throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render
+ * method must not be invoked within the current client request"
  */
 public class PortletExceptionDuringRequestHandlingPortlet extends AbstractTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringInitPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -30,20 +31,15 @@
 /**
  * DISABLED - NOT CURRENTLY USED TEST CASE
  *
- * @portlet.specification
- *    assert="SPEC:5 - During initialization, the portlet object may throw an UnavailableException
- *           or a PortletException. In this case, the portlet container must not place the portlet object
- *           into active service and it must release the portlet object."
- *
- * @portlet.specification
- *    assert="SPEC:6 - The destroy method must not be called because the initialization is
- *           considered unsuccessful."
- *
- * @portlet.specification
- *    assert="SPEC:8 - A RuntimeException thrown during initialization must be handled as a PortletException."
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:5 - During initialization, the portlet object may throw an UnavailableException
+ * or a PortletException. In this case, the portlet container must not place the portlet object into active service and
+ * it must release the portlet object."
+ * @portlet.specification assert="SPEC:6 - The destroy method must not be called because the initialization is
+ * considered unsuccessful."
+ * @portlet.specification assert="SPEC:8 - A RuntimeException thrown during initialization must be handled as a
+ * PortletException."
  */
 public class RuntimeExceptionDuringInitPortlet extends AbstractUniversalTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -34,21 +35,16 @@
 import java.io.IOException;
 
 /**
- * DISABLED - NOT CURRENTLY USED TEST CASE 
+ * DISABLED - NOT CURRENTLY USED TEST CASE
  *
- * @portlet.specification
- *    assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
- *            of the request and that the portlet container should take appropriate measures to clean
- *            up the request. If a portlet throws an exception in the processAction method, all
- *            operations on the ActionResponse must be ignored and the render method must not be
- *            invoked within the current client request"
- *
- * @portlet.specification
- *    assert="SPEC:19 - "A RuntimeException thrown during the request handling must be handled
- *            as a PortletException"
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:17 -"A PortletException signals that an error has occurred during the processing
+ * of the request and that the portlet container should take appropriate measures to clean up the request. If a portlet
+ * throws an exception in the processAction method, all operations on the ActionResponse must be ignored and the render
+ * method must not be invoked within the current client request"
+ * @portlet.specification assert="SPEC:19 - "A RuntimeException thrown during the request handling must be handled as a
+ * PortletException"
  */
 public class RuntimeExceptionDuringRequestHandlingPortlet extends AbstractTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringInitPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -29,17 +30,13 @@
 import javax.portlet.UnavailableException;
 
 /**
- * @portlet.specification
- *    assert="SPEC:5 - During initialization, the portlet object may throw an UnavailableException
- *           or a PortletException. In this case, the portlet container must not place the portlet object
- *           into active service and it must release the portlet object."
- *
- * @portlet.specification
- *    assert="SPEC:6 - The destroy method must not be called because the initialization is
- *           considered unsuccessful."
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:5 - During initialization, the portlet object may throw an UnavailableException
+ * or a PortletException. In this case, the portlet container must not place the portlet object into active service and
+ * it must release the portlet object."
+ * @portlet.specification assert="SPEC:6 - The destroy method must not be called because the initialization is
+ * considered unsuccessful."
  */
 public class UnavailableExceptionDuringInitPortlet extends AbstractUniversalTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -36,14 +37,11 @@
 /**
  * DISABLED - NOT CURRENTLY USED TEST CASE
  *
- * @portlet.specification
- *    assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException,
- *            the portlet container must remove the portlet from service immediately, call the
- *            portlet’s destroy method, and release the portlet object."
- *
- * 
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException, the
+ * portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release
+ * the portlet object."
  */
 public class UnavailableExceptionDuringProcessActionPortlet extends AbstractTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -34,13 +35,11 @@
 /**
  * DISABLED - NOT CURRENTLY USED TEST CASE
  *
- * @portlet.specification
- *    assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException,
- *            the portlet container must remove the portlet from service immediately, call the
- *            portlet’s destroy method, and release the portlet object."
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:18 - If a permanent unavailability is indicated by the UnavailableException, the
+ * portlet container must remove the portlet from service immediately, call the portlet’s destroy method, and release
+ * the portlet object."
  */
 public class UnavailableExceptionDuringRenderPortlet extends AbstractTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletmode;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/PortletModeTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletmode;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec;
 
 import org.jboss.portal.test.framework.portlet.Joinpoint;
@@ -27,12 +28,10 @@
 import javax.portlet.PortletURL;
 
 /**
- * @portlet.specification
- *    assert="SPEC:38 - The portlet must not be invoked in a portlet mode that has not
- *            been declared as supported for a given markup type"
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version : 1.1 $
+ * @portlet.specification assert="SPEC:38 - The portlet must not be invoked in a portlet mode that has not been declared
+ * as supported for a given markup type"
  */
 public class NotInvokeModeDeclaredForNotSupportedMarkupHelperPortlet extends AbstractUniversalTestPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletmode/spec/RequestDispatchingDependingOnModePortlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletmode.spec;
 
 import org.jboss.portal.test.framework.container.TestCaseContext;
@@ -37,13 +38,11 @@
 import java.io.IOException;
 
 /**
- * @portlet.specification
- *    assert="SPEC:36 - The GenericPortlet class implementation of the render method dispatches requests
- *    to the doView, doEdit or doHelp method depending on the portlet mode indicated in the
- *    request using the doDispatch method."
- *
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
  * @version $Revision$
+ * @portlet.specification assert="SPEC:36 - The GenericPortlet class implementation of the render method dispatches
+ * requests to the doView, doEdit or doHelp method depending on the portlet mode indicated in the request using the
+ * doDispatch method."
  */
 public class RequestDispatchingDependingOnModePortlet extends AbstractTestGenericPortlet
 {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
 import junit.framework.Test;
@@ -93,7 +94,6 @@
        * NOT TESTABLE NOW AS PORTAL DOESN'T SUPPORT ADDITIONAL CONTENT TYPES
        */
 
-
       /**
        * SPEC:63 Testable=true Section=PLT.11.2.1
        */

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletrequests;
 
-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.EndTestResult;
 import org.jboss.portal.test.framework.container.result.InvokeGetResult;
-import org.jboss.portal.test.framework.container.result.InvokePostResult;
 import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.portlet.Sequence;
 import org.jboss.portal.test.framework.portlet.SequenceRegistry;
@@ -41,17 +39,8 @@
 import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringWriter;
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:boleslaw.dawidowicz at jboss.org">Boleslaw Dawidowicz</a>
@@ -63,8 +52,8 @@
    private final byte[] byteContent = {65, 66, 67, 68, 69, 70};
 
    /**
-    * @portlet.specification assert="SPEC:50 - The portlet-container must not propagate parameters received
-    * in an action request to subsequent render requests of the portlet."
+    * @portlet.specification assert="SPEC:50 - The portlet-container must not propagate parameters received in an action
+    * request to subsequent render requests of the portlet."
     */
    public void createActionToRequestParametersNotPropagatedCase(SequenceRegistry registry)
    {
@@ -104,9 +93,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:52 - If a portlet receives a render request following an action
-    * request as part of the same client request, the parameters received with render
-    * request must be the render parameters set during the action request."
+    * @portlet.specification assert="SPEC:52 - If a portlet receives a render request following an action request as
+    * part of the same client request, the parameters received with render request must be the render parameters set
+    * during the action request."
     */
    public void createActionToRenderParametersCase(SequenceRegistry registry)
    {
@@ -144,9 +133,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:51 - If a portlet receives a render request that is the result of
-    * a client request targeted to another portlet in the portal page, the
-    * parameters must be the same parameters as of the previous render request."
+    * @portlet.specification assert="SPEC:51 - If a portlet receives a render request that is the result of a client
+    * request targeted to another portlet in the portal page, the parameters must be the same parameters as of the
+    * previous render request."
     * @portlet.specification assert="SPEC:54 - A portlet must not see any parameter targeted to other portlets."
     */
    public void createParametersDuringRenderNotTargetedCase(SequenceRegistry registry)
@@ -231,13 +220,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:55 - The getParameterValues method returns an array of String
-    * objects containing all the parameter values associated with a parameter
-    * name. The value returned from the getParameter method must be the first value
-    * in the array of String objects returned by getParameterValues"
-    * @portlet.specification assert="SPEC:56 - If there is a single parameter value associated with a parameter
-    * name the method returns must return an array of size one containing the parameter
-    * value"
+    * @portlet.specification assert="SPEC:55 - The getParameterValues method returns an array of String objects
+    * containing all the parameter values associated with a parameter name. The value returned from the getParameter
+    * method must be the first value in the array of String objects returned by getParameterValues"
+    * @portlet.specification assert="SPEC:56 - If there is a single parameter value associated with a parameter name the
+    * method returns must return an array of size one containing the parameter value"
     */
    public void createParameterAccessMethodstCase(SequenceRegistry registry)
    {
@@ -279,13 +266,12 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:58 - The context path of a request is exposed via the request object.
-    * The context path is the path prefix associated with the deployed portlet
-    * application. If the portlet application is rooted at the base of the web
-    * server URL namespace (also known as "default" context), this path must be
-    * an empty string"
-    * @portlet.specification assert="SPEC:59 - "Otherwise, it must be the path the portlet application is rooted
-    * to, the path must start with a '/' and it must not end with a '/' character."
+    * @portlet.specification assert="SPEC:58 - The context path of a request is exposed via the request object. The
+    * context path is the path prefix associated with the deployed portlet application. If the portlet application is
+    * rooted at the base of the web server URL namespace (also known as "default" context), this path must be an empty
+    * string"
+    * @portlet.specification assert="SPEC:59 - "Otherwise, it must be the path the portlet application is rooted to, the
+    * path must start with a '/' and it must not end with a '/' character."
     */
    public void createContextPathCase(SequenceRegistry registry)
    {
@@ -336,7 +322,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:60 - If the user is not authenticated the getAuthType method must return null"
+    * @portlet.specification assert="SPEC:60 - If the user is not authenticated the getAuthType method must return
+    * null"
     */
    public void createAuthTypeCase(SequenceRegistry registry)
    {
@@ -372,13 +359,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:61 - If the portlet container supports additional content types
-    * for the portlet’s output, it must declare the additional content types
-    * through the getResponseContentTypes method of the request object. The
-    * returned Enumeration of strings should contain the content types the
-    * portlet container supports in order of preference. The first element of
-    * the enumeration must be the same content type returned by the
-    * getResponseContentType method."
+    * @portlet.specification assert="SPEC:61 - If the portlet container supports additional content types for the
+    * portlet’s output, it must declare the additional content types through the getResponseContentTypes method of the
+    * request object. The returned Enumeration of strings should contain the content types the portlet container
+    * supports in order of preference. The first element of the enumeration must be the same content type returned by
+    * the getResponseContentType method."
     */
    public void createContentTypeCase(SequenceRegistry registry)
    {
@@ -415,10 +400,10 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:63 - Only one of the two methods, getPortletInputStream or getReader,
-    * can be used during an action request. If the input stream is obtained, a call
-    * to the getReader must throw an IllegalStateException. Similarly, if the reader is
-    * obtained, a call to the getPortletInputStream must throw an IllegalStateException."
+    * @portlet.specification assert="SPEC:63 - Only one of the two methods, getPortletInputStream or getReader, can be
+    * used during an action request. If the input stream is obtained, a call to the getReader must throw an
+    * IllegalStateException. Similarly, if the reader is obtained, a call to the getPortletInputStream must throw an
+    * IllegalStateException."
     */
    public void createObtainingInputStreamAndReaderCase(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
 
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.EndTestResult;
 import org.jboss.portal.test.framework.container.result.FailureResult;
 import org.jboss.portal.test.framework.container.result.InvokeGetResult;
@@ -63,10 +63,9 @@
 public class PortletResponsesSequenceBuilder extends SequenceRegistryBuilder
 {
    /**
-    * @portlet.specification assert="SPEC:65 - The sendRedirect method instructs the portal/portlet-container
-    * to set the appropriate headers and content body to redirect the user to a
-    * different URL. A fully qualified URL or a full path URL must be specified.
-    * If a relative path URL is given, an IllegalArgumentException must be thrown."
+    * @portlet.specification assert="SPEC:65 - The sendRedirect method instructs the portal/portlet-container to set the
+    * appropriate headers and content body to redirect the user to a different URL. A fully qualified URL or a full path
+    * URL must be specified. If a relative path URL is given, an IllegalArgumentException must be thrown."
     */
    public void createSendRedirectWithRelativeURLCase(SequenceRegistry registry)
    {
@@ -107,9 +106,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:66 - If the sendRedirect method is called after the setPortletMode, setWindowState,
-    * setRenderParameter or setRenderParameters methods of the ActionResponse interface,
-    * an IllegalStateException must be thrown and the redirection must not be executed"
+    * @portlet.specification assert="SPEC:66 - If the sendRedirect method is called after the setPortletMode,
+    * setWindowState, setRenderParameter or setRenderParameters methods of the ActionResponse interface, an
+    * IllegalStateException must be thrown and the redirection must not be executed"
     */
    public void createSendRedirectAfterChangeStateMethodsCase(SequenceRegistry registry)
    {
@@ -231,10 +230,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:67 - The setPortletMode method allows a portlet to change its
-    * current portlet mode. The new portlet mode would be effective in the following
-    * render request. If a portlet attempts to set a portlet mode that is not allowed to
-    * switch to, a PortletModeException must be thrown."
+    * @portlet.specification assert="SPEC:67 - The setPortletMode method allows a portlet to change its current portlet
+    * mode. The new portlet mode would be effective in the following render request. If a portlet attempts to set a
+    * portlet mode that is not allowed to switch to, a PortletModeException must be thrown."
     */
    public void createNotAllowedModeCase(SequenceRegistry registry)
    {
@@ -275,9 +273,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:68 - The setWindowState method allows a portlet to change its current window state.
-    * The new window state would be effective in the following render request. If a portlet attempts
-    * to set a window state that it is not allowed to switch to, a WindowStateException must be thrown."
+    * @portlet.specification assert="SPEC:68 - The setWindowState method allows a portlet to change its current window
+    * state. The new window state would be effective in the following render request. If a portlet attempts to set a
+    * window state that it is not allowed to switch to, a WindowStateException must be thrown."
     */
    public void createNotSupportedWindowStateCase(SequenceRegistry registry)
    {
@@ -318,10 +316,10 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:69 - If the setPortletMode or setWindowState methods are
-    * called after the sendRedirect method has been called an IllegalStateException
-    * must be thrown."
-    * @portlet.specification assert="SPEC:70 - If the exception is caught by the portlet, the redirection must be executed."
+    * @portlet.specification assert="SPEC:69 - If the setPortletMode or setWindowState methods are called after the
+    * sendRedirect method has been called an IllegalStateException must be thrown."
+    * @portlet.specification assert="SPEC:70 - If the exception is caught by the portlet, the redirection must be
+    * executed."
     */
    public void createStateChangesAfterRedirectionSendCase(SequenceRegistry registry)
    {
@@ -382,12 +380,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:72 - Using the setRenderParameter and setRenderParameters methods
-    * of the ActionResponse interface portlets may set render parameters during
-    * an action request. A call to any of the setRenderParameter methods must
-    * replace any parameter with the same name previously set."
-    * @portlet.specification assert="SPEC:73 - If no render parameters are set during the processAction
-    * invocation, the render request must not contain any request parameters."
+    * @portlet.specification assert="SPEC:72 - Using the setRenderParameter and setRenderParameters methods of the
+    * ActionResponse interface portlets may set render parameters during an action request. A call to any of the
+    * setRenderParameter methods must replace any parameter with the same name previously set."
+    * @portlet.specification assert="SPEC:73 - If no render parameters are set during the processAction invocation, the
+    * render request must not contain any request parameters."
     */
    public void createRenderParametersCase(SequenceRegistry registry)
    {
@@ -437,12 +434,10 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:74 - If the setRenderParameter or setRenderParameters methods are called
-    * after the sendRedirect method has been called an IllegalStateException must
-    * be thrown"
-    * @portlet.specification assert="SPEC:75 - If the exception is caught by the portlet, the redirection must
-    * be executed. If the exception is propagated back to the portlet-container,
-    * the redirection must not be executed."
+    * @portlet.specification assert="SPEC:74 - If the setRenderParameter or setRenderParameters methods are called after
+    * the sendRedirect method has been called an IllegalStateException must be thrown"
+    * @portlet.specification assert="SPEC:75 - If the exception is caught by the portlet, the redirection must be
+    * executed. If the exception is propagated back to the portlet-container, the redirection must not be executed."
     */
    public void createParametersSetAfterSendRedirectCase(SequenceRegistry registry)
    {
@@ -506,10 +501,9 @@
 
    /**
     * @portlet.specification assert="SPEC:76 - A portlet must set the content type of the response using the
-    * setContentType method of the RenderResponse interface. The setContentType
-    * method must throw an IllegalArgumentException if the content type set does
-    * not match (including wildcard matching) any of the content types returned by
-    * the getResponseContentType method of the PortleRequest object"
+    * setContentType method of the RenderResponse interface. The setContentType method must throw an
+    * IllegalArgumentException if the content type set does not match (including wildcard matching) any of the content
+    * types returned by the getResponseContentType method of the PortleRequest object"
     */
    public void createSetNotSupportedContentTypeCase(SequenceRegistry registry)
    {
@@ -534,8 +528,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:77 - If the getWriter or getPortletOutputStream methods are called
-    * before the setContentType method, they must throw an IllegalStateException."
+    * @portlet.specification assert="SPEC:77 - If the getWriter or getPortletOutputStream methods are called before the
+    * setContentType method, they must throw an IllegalStateException."
     */
    public void createSetContentTypeBeforeOutputStreamOrWriterCase(SequenceRegistry registry)
    {
@@ -577,8 +571,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:78 - If the portlet has set a content type, the getContentType
-    * method must return it. Otherwise, the getContentType method must return null."
+    * @portlet.specification assert="SPEC:78 - If the portlet has set a content type, the getContentType method must
+    * return it. Otherwise, the getContentType method must return null."
     */
    public void createGetContentTypeCase(SequenceRegistry registry)
    {
@@ -608,10 +602,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:79 - A portlet may generate its content by writing to the OutputStream
-    * or to the Writer of the RenderResponse object. A portlet must use only one
-    * of these objects. The portlet container must throw an IllegalStateException
-    * if a portlet attempts to use both."
+    * @portlet.specification assert="SPEC:79 - A portlet may generate its content by writing to the OutputStream or to
+    * the Writer of the RenderResponse object. A portlet must use only one of these objects. The portlet container must
+    * throw an IllegalStateException if a portlet attempts to use both."
     */
    public void createOutputStreamOrWriterCase(SequenceRegistry registry)
    {
@@ -667,13 +660,12 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:86 - The getNamespace method must provide the portlet with a mechanism
-    * that ensures the uniqueness of the returned string in the whole portal page"
-    * @portlet.specification assert="SPEC:87 - The getNamespace method must return the same value if invoked
-    * multiple times within a render request."
-    * @portlet.specification assert="SPEC:88 - The getNamespace method must return a valid identifier as
-    * defined in the 3.8 Identifier Section of the Java Language Specification
-    * Second Edition."
+    * @portlet.specification assert="SPEC:86 - The getNamespace method must provide the portlet with a mechanism that
+    * ensures the uniqueness of the returned string in the whole portal page"
+    * @portlet.specification assert="SPEC:87 - The getNamespace method must return the same value if invoked multiple
+    * times within a render request."
+    * @portlet.specification assert="SPEC:88 - The getNamespace method must return a valid identifier as defined in the
+    * 3.8 Identifier Section of the Java Language Specification Second Edition."
     */
    public void createNamespaceEncodingCase(SequenceRegistry registry)
    {
@@ -699,9 +691,7 @@
       });
    }
 
-   /**
-    * Checks if string is valid java identifier as defined in 'Java Language Specification'
-    */
+   /** Checks if string is valid java identifier as defined in 'Java Language Specification' */
    public static boolean isJavaIdentifier(String s)
    {
       if (s.length() == 0 || !Character.isJavaIdentifierStart(s.charAt(0)))
@@ -724,10 +714,9 @@
 
 
    /**
-    * @portlet.specification assert="SPEC:71 - If the setPortletMode or setWindowState methods are called after
-    * the sendRedirect method has been called an IllegalStateException must be thrown.
-    * (...) If the exception is propagated back to the portlet-container, the redirection
-    * must not be executed."
+    * @portlet.specification assert="SPEC:71 - If the setPortletMode or setWindowState methods are called after the
+    * sendRedirect method has been called an IllegalStateException must be thrown. (...) If the exception is propagated
+    * back to the portlet-container, the redirection must not be executed."
     */
    public void createIllegalStateExceptionAfterSendRedirectCase(SequenceRegistry registry)
    {
@@ -772,13 +761,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:80 - The getBufferSize method returns the size of the underlying
-    * buffer being used. If no buffering is being used, this method must
-    * return the int value of 0 (zero)"
-    * @portlet.specification assert="SPEC:81 - The portlet can request a preferred buffer size by using
-    * the setBufferSize method. The buffer assigned is not required to be
-    * the size requested by the portlet, but must be at least as large as
-    * the size requested."
+    * @portlet.specification assert="SPEC:80 - The getBufferSize method returns the size of the underlying buffer being
+    * used. If no buffering is being used, this method must return the int value of 0 (zero)"
+    * @portlet.specification assert="SPEC:81 - The portlet can request a preferred buffer size by using the
+    * setBufferSize method. The buffer assigned is not required to be the size requested by the portlet, but must be at
+    * least as large as the size requested."
     */
    public void createBufferSizeCase(SequenceRegistry registry)
    {
@@ -802,8 +789,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:83 - If the response is committed and the reset or resetBuffer
-    * method is called, an IllegalStateException must be thrown."
+    * @portlet.specification assert="SPEC:83 - If the response is committed and the reset or resetBuffer method is
+    * called, an IllegalStateException must be thrown."
     */
    public void createBufferResetCase(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletresponses/PortletResponsesTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletresponses;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionEvents.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
+import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSessionListener;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -85,15 +85,18 @@
       public static final int DESTROYED = 1;
       private final String sessionId;
       private final int type;
+
       public Event(String sessionId, int type)
       {
          this.sessionId = sessionId;
          this.type = type;
       }
+
       public String getSessionId()
       {
          return sessionId;
       }
+
       public int getType()
       {
          return type;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/HttpSessionInvalidatorServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
 import org.jboss.portal.common.junit.ExtendedAssert;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -27,10 +28,10 @@
 import org.jboss.portal.test.framework.portlet.Sequence;
 import org.jboss.portal.test.framework.portlet.SequenceRegistry;
 import org.jboss.portal.test.framework.portlet.SequenceRegistryBuilder;
-import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.framework.portlet.actions.PortletActionTestAction;
 import org.jboss.portal.test.framework.portlet.actions.PortletRenderTestAction;
 import org.jboss.portal.test.framework.portlet.actions.ServletServiceTestAction;
+import org.jboss.portal.test.framework.portlet.components.AbstractUniversalTestPortlet;
 import org.jboss.portal.test.framework.portlet.universal.UTP1;
 import org.jboss.portal.test.framework.portlet.universal.UTP2;
 import org.jboss.portal.test.framework.portlet.universal.UTS1;
@@ -38,20 +39,18 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PortletSession;
 import javax.portlet.PortletURL;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletException;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.util.Enumeration;
-import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -63,13 +62,11 @@
 {
 
    /**
-    * @portlet.specification assert="SPEC:106 - For portlets within the same portlet application, a
-    * portlet container must ensure that every portlet request generated
-    * as result of a group of requests originated from the portal to complete
-    * a single client request receive or acquire the same session"
-    * @portlet.specification assert="SPEC:107 - In addition, if within these portlet requests more
-    * than one portlet creates a session, the session object must be
-    * the same for all the portlets in the same portlet application"
+    * @portlet.specification assert="SPEC:106 - For portlets within the same portlet application, a portlet container
+    * must ensure that every portlet request generated as result of a group of requests originated from the portal to
+    * complete a single client request receive or acquire the same session"
+    * @portlet.specification assert="SPEC:107 - In addition, if within these portlet requests more than one portlet
+    * creates a session, the session object must be the same for all the portlets in the same portlet application"
     */
    public void createSessionCreateCase(SequenceRegistry registry)
    {
@@ -108,22 +105,20 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:110 - Any object stored in the session using the APPLICATION_SCOPE
-    * is available to any other portlet that belongs to the same portlet application
-    * and that handles a request identified as being a part of the same session."
-    * @portlet.specification assert="SPEC:111 - Objects stored in the session using the PORTLET_SCOPE must be
-    * available to the portlet during requests for the same portlet window that
-    * the objects where stored from."
-    * @portlet.specification assert="SPEC:112 - The object must be stored in the APPLICATION_SCOPE with the
-    * following fabricated attribute name ‘javax.portlet.p.<ID>?<ATTRIBUTE_NAME>’.
-    * <ID> is a unique identification for the portlet window (assigned by the
-    * portal/portlet-container) that must not contain a ‘?’ character."
-    * @portlet.specification assert="SPEC:117 - The attribute names must be the same if APPLICATION_SCOPE scope
-    * is used."
-    * @portlet.specification assert="SPEC:118 - The attribute name has to conform with the specified prefixing
-    * if PORTLET_SCOPE is used"
-    * @portlet.specification assert="SPEC:119 - The variant of these methods that does not receive a scope must
-    * be treated as PORTLET_SCOPE."
+    * @portlet.specification assert="SPEC:110 - Any object stored in the session using the APPLICATION_SCOPE is
+    * available to any other portlet that belongs to the same portlet application and that handles a request identified
+    * as being a part of the same session."
+    * @portlet.specification assert="SPEC:111 - Objects stored in the session using the PORTLET_SCOPE must be available
+    * to the portlet during requests for the same portlet window that the objects where stored from."
+    * @portlet.specification assert="SPEC:112 - The object must be stored in the APPLICATION_SCOPE with the following
+    * fabricated attribute name ‘javax.portlet.p.<ID>?<ATTRIBUTE_NAME>’. <ID> is a unique identification for the portlet
+    * window (assigned by the portal/portlet-container) that must not contain a ‘?’ character."
+    * @portlet.specification assert="SPEC:117 - The attribute names must be the same if APPLICATION_SCOPE scope is
+    * used."
+    * @portlet.specification assert="SPEC:118 - The attribute name has to conform with the specified prefixing if
+    * PORTLET_SCOPE is used"
+    * @portlet.specification assert="SPEC:119 - The variant of these methods that does not receive a scope must be
+    * treated as PORTLET_SCOPE."
     */
    public void createSessionAttributesCase(SequenceRegistry registry)
    {
@@ -217,13 +212,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:113 - The PortletSession must store all attributes in the
-    * HttpSession of the portlet application. A direct consequence of this is
-    * that data stored in the HttpSession by servlets or JSPs is accessible
-    * to portlets through the PortletSession in the portlet application scope."
-    * @portlet.specification assert="SPEC:114 - Conversely, data stored by portlets in the PortletSession in
-    * the portlet application scope is accessible to servlets and JSPs through
-    * the HttpSession."
+    * @portlet.specification assert="SPEC:113 - The PortletSession must store all attributes in the HttpSession of the
+    * portlet application. A direct consequence of this is that data stored in the HttpSession by servlets or JSPs is
+    * accessible to portlets through the PortletSession in the portlet application scope."
+    * @portlet.specification assert="SPEC:114 - Conversely, data stored by portlets in the PortletSession in the portlet
+    * application scope is accessible to servlets and JSPs through the HttpSession."
     */
    public void createHttpSessionRelationsCase(SequenceRegistry registry)
    {
@@ -270,8 +263,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:115 - If the HttpSession object is invalidated, the PortletSession
-    * object must also be invalidated by the portlet container."
+    * @portlet.specification assert="SPEC:115 - If the HttpSession object is invalidated, the PortletSession object must
+    * also be invalidated by the portlet container."
     */
    public void createHttpSessionInvalidatesPortletSession(SequenceRegistry registry)
    {
@@ -315,8 +308,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:116 - If the PortletSession object is invalidated by a portlet,
-    * the portlet container must invalidate the associated HttpSession object."
+    * @portlet.specification assert="SPEC:116 - If the PortletSession object is invalidated by a portlet, the portlet
+    * container must invalidate the associated HttpSession object."
     */
    public void createPortletSessionInvalidatesHttpSession(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portletsession;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletURLTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
 
 import junit.framework.Test;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portleturl/PortletUrlSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.portleturl;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -51,9 +52,8 @@
 public class PortletUrlSequenceBuilder extends SequenceRegistryBuilder
 {
    /**
-    * @portlet.specification assert="SPEC:26 - A render URL is an optimization for a special type of action URLs.
-    * The portal/portletcontainer must not invoke the processAction method of the
-    * targeted portlet."
+    * @portlet.specification assert="SPEC:26 - A render URL is an optimization for a special type of action URLs. The
+    * portal/portletcontainer must not invoke the processAction method of the targeted portlet."
     */
    public void createRenderURLNotInvokeActionCase(SequenceRegistry registry)
    {
@@ -88,12 +88,11 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:27 - The portal/portlet-container must ensure that all the parameters set
-    * when constructing the render URL become render parameters of the subsequent render
-    * requests for the portlet."
+    * @portlet.specification assert="SPEC:27 - The portal/portlet-container must ensure that all the parameters set when
+    * constructing the render URL become render parameters of the subsequent render requests for the portlet."
     * @portlet.specification assert="SPEC:28 - Portlets can add application specific parameters to the PortletURL
-    * objects using the setParameter and setParameters methods. A call to any of the
-    * setParameter methods must replace any parameter with the same name previously set."
+    * objects using the setParameter and setParameters methods. A call to any of the setParameter methods must replace
+    * any parameter with the same name previously set."
     * @portlet.specification assert="SPEC:29 - All the parameters a portlet adds to a PortletURL object must be made
     * available to the portlet as request parameters"
     */
@@ -200,8 +199,8 @@
 
    /**
     * @portlet.specification assert="SPEC:32 - A portlet cannot create a portlet URL using a portlet mode that is not
-    * defined as supported by the portlet or that the user it is not allowed to use.
-    * The setPortletMode methods must throw a PortletModeException in that situation."
+    * defined as supported by the portlet or that the user it is not allowed to use. The setPortletMode methods must
+    * throw a PortletModeException in that situation."
     */
    public void createPortletURLWithNotSupportedModeCase(SequenceRegistry registry)
    {
@@ -228,9 +227,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:34 - A portlet cannot create a portlet URL using a window state that
-    * is not supported by the portlet container. The setWindowState method must
-    * throw a WindowStateException if that is the case"
+    * @portlet.specification assert="SPEC:34 - A portlet cannot create a portlet URL using a window state that is not
+    * supported by the portlet container. The setWindowState method must throw a WindowStateException if that is the
+    * case"
     */
    public void createPortletURLWithNotSupportedStateCase(SequenceRegistry registry)
    {
@@ -256,10 +255,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:35 - The setSecure method of the PortletURL interface allows a
-    * portlet to indicate if the portlet URL has to be a secure URL or not
-    * (i.e. HTTPS or HTTP). If the setSecure method is not used, the portlet
-    * URL must be of the same security level of the current request."
+    * @portlet.specification assert="SPEC:35 - The setSecure method of the PortletURL interface allows a portlet to
+    * indicate if the portlet URL has to be a secure URL or not (i.e. HTTPS or HTTP). If the setSecure method is not
+    * used, the portlet URL must be of the same security level of the current request."
     */
    public void createSecurityLevelCase(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,27 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.preferences;
 
-import org.jboss.portal.test.framework.container.result.AssertResult;
 import org.jboss.portal.test.framework.container.result.EndTestResult;
 import org.jboss.portal.test.framework.container.result.InvokeGetResult;
 import org.jboss.portal.test.framework.container.result.Result;
@@ -45,7 +45,6 @@
 import javax.portlet.ActionResponse;
 import javax.portlet.Portlet;
 import javax.portlet.PortletPreferences;
-import javax.portlet.PortletURL;
 import javax.portlet.ReadOnlyException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
@@ -62,7 +61,8 @@
 
 
    /**
-    * @portlet.specification assert="SPEC:90 Preference attributes are String array objects. Preferences attributes can be set to null."
+    * @portlet.specification assert="SPEC:90 Preference attributes are String array objects. Preferences attributes can
+    * be set to null."
     */
    public void createPreferencesCanBeSetToNullCase(SequenceRegistry registry)
    {
@@ -138,8 +138,8 @@
 
    /**
     * @portlet.specification assert="SPEC:91 - The getMap method returns an immutable Map of String keys and String[]
-    * values containing all current preference values. Preferences values must not be modified
-    * if the values in the Map are altered."
+    * values containing all current preference values. Preferences values must not be modified if the values in the Map
+    * are altered."
     */
    public void createPreferencesMapModificationDoesNotModifyPreferencesValuesCase(SequenceRegistry registry)
    {
@@ -189,8 +189,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:92 - The reset method must reset a preference attribute to its default
-    * value. If there is no default value, the preference attribute must be deleted."
+    * @portlet.specification assert="SPEC:92 - The reset method must reset a preference attribute to its default value.
+    * If there is no default value, the preference attribute must be deleted."
     * <p/>
     * Does not cover restore to default test yet.
     */
@@ -290,8 +290,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:93 - If a preference attribute is read only, the setValue, setValues
-    * and reset methods must throw a ReadOnlyException when the portlet is in any of the standard modes"
+    * @portlet.specification assert="SPEC:93 - If a preference attribute is read only, the setValue, setValues and reset
+    * methods must throw a ReadOnlyException when the portlet is in any of the standard modes"
     */
    public void createReadOnlyPreferenceCannotBeModifiedCase(SequenceRegistry registry)
    {
@@ -389,8 +389,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:96 - All changes made to PortletPreferences object not followed by a
-    * call to the store method must be discarded when the portlet finishes the 20 processAction method."
+    * @portlet.specification assert="SPEC:96 - All changes made to PortletPreferences object not followed by a call to
+    * the store method must be discarded when the portlet finishes the 20 processAction method."
     */
    public void createChangesMadeButNotStoredAreDiscardedCase(SequenceRegistry registry)
    {
@@ -465,8 +465,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:97 - If the store method is invoked within the scope of a
-    * render method invocation, it must throw an IllegalStateException."
+    * @portlet.specification assert="SPEC:97 - If the store method is invoked within the scope of a render method
+    * invocation, it must throw an IllegalStateException."
     */
    public void createStoreCalledDuringRenderThrowsIllegalArgumentExceptionCase(SequenceRegistry registry)
    {
@@ -495,8 +495,8 @@
 
    /**
     * @portlet.specification assert="SPEC:99 - If a preference attribute definition does not contain the read-only
-    * element set to true, the preference attribute is modifiable when the portlet
-    * is processing an action request in any of the standard portlet modes (VIEW, EDIT or HELP)."
+    * element set to true, the preference attribute is modifiable when the portlet is processing an action request in
+    * any of the standard portlet modes (VIEW, EDIT or HELP)."
     */
    public void createCanModifyNonReadOnlyPreferenceCase(SequenceRegistry registry)
    {
@@ -571,10 +571,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:100 - Portlets are not restricted to use preference attributes defined
-    * in the deployment descriptor. They can programmatically add preference
-    * attributes using names not defined in the deployment descriptor. These
-    * preferences attributes must be treated as modifiable attributes."
+    * @portlet.specification assert="SPEC:100 - Portlets are not restricted to use preference attributes defined in the
+    * deployment descriptor. They can programmatically add preference attributes using names not defined in the
+    * deployment descriptor. These preferences attributes must be treated as modifiable attributes."
     */
    public void createDynamicPreferenceTreatedLikeModifiablePreferenceCase(SequenceRegistry registry)
    {
@@ -684,9 +683,8 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:101 - If a portlet definition includes a validator, the portlet
-    * container must create a single validator instance per portlet definition.
-    * (according to spec: Testable=false ;)"
+    * @portlet.specification assert="SPEC:101 - If a portlet definition includes a validator, the portlet container must
+    * create a single validator instance per portlet definition. (according to spec: Testable=false ;)"
     */
    public void createCreateASingleInstanceOfValidatorCase(SequenceRegistry registry)
    {
@@ -704,9 +702,9 @@
 
 
    /**
-    * @portlet.specification assert="SPEC:103 - When a validator is associated with the preferences of a portlet definition,
-    * the store method of the PortletPreferences implementation must invoke the validate
-    * method of the validator before writing the changes to the persistent store."
+    * @portlet.specification assert="SPEC:103 - When a validator is associated with the preferences of a portlet
+    * definition, the store method of the PortletPreferences implementation must invoke the validate method of the
+    * validator before writing the changes to the persistent store."
     * @portlet.specification assert="SPEC:105 - If the validation is successful, the store operation must be completed"
     */
    public void createValidationStoresCase(SequenceRegistry registry)
@@ -785,10 +783,9 @@
    }
 
    /**
-    * @portlet.specification assert="SPEC:104 - If the validation fails, the PreferencesValidator implementation
-    * must throw a ValidatorException. If a ValidatorException is thrown, the
-    * portlet container must cancel the store operation and it must propagate
-    * the exception to the portlet"
+    * @portlet.specification assert="SPEC:104 - If the validation fails, the PreferencesValidator implementation must
+    * throw a ValidatorException. If a ValidatorException is thrown, the portlet container must cancel the store
+    * operation and it must propagate the exception to the portlet"
     */
    public void createInvalidationCancelsStoreCase(SequenceRegistry registry)
    {
@@ -865,8 +862,4 @@
    }
 
 
-
-
-   
-
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/PreferencesTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.preferences;
 
 import junit.framework.Test;
@@ -36,9 +37,6 @@
    {
       TestSuite suite = new TestSuite("test-jsr168-preferences.war");
 
-
-
-
       /**
        * SPEC:90 Testable= true Section=PLT.14.1
        */
@@ -119,7 +117,6 @@
       suite.addTest(new TestCase("InvalidationCancelsStore"));
 
 
-
       return suite;
    }
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/CreateASingleInstanceOfValidatorValidator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.preferences.spec;
 
 import javax.portlet.PortletPreferences;
@@ -43,7 +44,7 @@
 
    public CreateASingleInstanceOfValidatorValidator()
    {
-      synchronized(CreateASingleInstanceOfValidatorValidator.class)
+      synchronized (CreateASingleInstanceOfValidatorValidator.class)
       {
          createdCount++;
       }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/InvalidationCancelsStoreValidator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.preferences.spec;
 
 import javax.portlet.PortletPreferences;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/preferences/spec/ValidationStoresValidator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.preferences.spec;
 
 import javax.portlet.PortletPreferences;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesSequenceBuilder.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.windowstates;
 
 import org.jboss.portal.test.framework.container.result.EndTestResult;
@@ -47,9 +48,8 @@
 {
 
    /**
-    * @portlet.specification assert="SPEC:40 - If a custom window state defined in the deployment descriptor
-    * is not mapped to a custom window state provided by the portal, portlets
-    * must not be invoked in that window state."
+    * @portlet.specification assert="SPEC:40 - If a custom window state defined in the deployment descriptor is not
+    * mapped to a custom window state provided by the portal, portlets must not be invoked in that window state."
     */
    public void createCustomStateNotMappedNotInvokedCase(SequenceRegistry registry)
    {

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/windowstates/WindowStatesTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.jsr168.tck.windowstates;
 
 import junit.framework.Test;
@@ -44,8 +45,6 @@
       //suite.addTest(new TestCase("CustomStateNotMappedNotInvokedPortlet"));
 
 
-
-
       return suite;
    }
 }

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/navigation/StateStringTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.portlet.navigation;
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/session/ReplicatedValue.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.session;
 
 import java.io.Serializable;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/session/SessionSynchronizationTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,52 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.session;
 
 import junit.framework.TestCase;
-import org.jboss.invocation.MarshalledValue;
-import org.jboss.portal.common.util.CollectionBuilder;
-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.portlet.session.SessionListener;
-import org.jboss.portal.portlet.session.SubSession;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionContext;
-import javax.servlet.http.HttpSessionEvent;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -67,7 +44,7 @@
 
    public void testA()
    {
-      
+
    }
 
 //   public void testListener() throws Exception

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/session/TestClassLoader.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.session;
 
 import org.jboss.portal.common.util.Tools;
@@ -41,7 +42,7 @@
    {
       if (ReplicatedValue.class.getName().equals(name))
       {
-         synchronized(this)
+         synchronized (this)
          {
             if (replicatedValueClass == null)
             {
@@ -49,7 +50,7 @@
                try
                {
                   in = ReplicatedValue.class.getClassLoader().getResourceAsStream(ReplicatedValue.class.getName().replace('.', '/') + ".class");
-                  ByteArrayOutputStream baos = new  ByteArrayOutputStream();
+                  ByteArrayOutputStream baos = new ByteArrayOutputStream();
                   Tools.copy(in, baos);
                   byte[] bytes = baos.toByteArray();
                   replicatedValueClass = defineClass(ReplicatedValue.class.getName(), bytes, 0, bytes.length);

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,55 +1,55 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
-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.state.DestroyCloneFailure;
-import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.state.AbstractPropertyContext;
-import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
-import org.jboss.portal.portlet.test.support.PortletSupport;
-import org.jboss.portal.portlet.test.ValueMapAssert;
+import junit.framework.TestCase;
+import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.common.util.LocalizedString;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.portlet.InvalidPortletIdException;
 import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.InvalidPortletIdException;
 import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.MetaInfo;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
 import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.info.MetaInfo;
-import org.jboss.portal.common.value.StringValue;
-import org.jboss.portal.common.util.LocalizedString;
-import org.jboss.portal.common.util.CollectionBuilder;
+import org.jboss.portal.portlet.state.AbstractPropertyContext;
+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.SimplePropertyMap;
+import org.jboss.portal.portlet.test.ValueMapAssert;
+import org.jboss.portal.portlet.test.support.PortletSupport;
+import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
 
-import java.util.Locale;
-import java.util.List;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
-import junit.framework.TestCase;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.1 $
@@ -649,10 +649,10 @@
       //
       Object ccpCtx = createClone(popCtx);
       ccpCtx = setProperties(ccpCtx, new PropertyChange[]{
-        PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value")),
-        PropertyChange.newUpdate("override_reset", new StringValue("override_reset_clone_value")),
-        PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value")),
-        PropertyChange.newUpdate("dynamic_reset", new StringValue("dynamic_reset_clone_value")),
+         PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value")),
+         PropertyChange.newUpdate("override_reset", new StringValue("override_reset_clone_value")),
+         PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value")),
+         PropertyChange.newUpdate("dynamic_reset", new StringValue("dynamic_reset_clone_value")),
       });
 
       //
@@ -668,15 +668,15 @@
 
       //
       PropertyChange[] changes = new PropertyChange[]
-      {
-         PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value_2")),
-         PropertyChange.newReset("override_reset"),
-         PropertyChange.newUpdate("override_create", new StringValue("override_create_clone_value_2")),
-         PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value_2")),
-         PropertyChange.newReset("dynamic_reset"),
-         PropertyChange.newUpdate("dynamic_create", new StringValue("dynamic_create_clone_value_2")),
-         PropertyChange.newUpdate("readonly_create", new StringValue("readonly_create_clone_value_2")),
-      };
+         {
+            PropertyChange.newUpdate("override_update", new StringValue("override_update_clone_value_2")),
+            PropertyChange.newReset("override_reset"),
+            PropertyChange.newUpdate("override_create", new StringValue("override_create_clone_value_2")),
+            PropertyChange.newUpdate("dynamic_update", new StringValue("dynamic_update_clone_value_2")),
+            PropertyChange.newReset("dynamic_reset"),
+            PropertyChange.newUpdate("dynamic_create", new StringValue("dynamic_create_clone_value_2")),
+            PropertyChange.newUpdate("readonly_create", new StringValue("readonly_create_clone_value_2")),
+         };
       ccpCtx = setProperties(ccpCtx, changes);
 
       //

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,49 +1,50 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
 import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
 import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.portlet.impl.state.producer.ProducerPersistenceManagerService;
+import org.jboss.portal.portlet.impl.state.StateConverterService;
 import org.jboss.portal.portlet.impl.state.StateManagementPolicyService;
-import org.jboss.portal.portlet.impl.state.StateConverterService;
 import org.jboss.portal.portlet.impl.state.consumer.ConsumerPersistenceManagerService;
+import org.jboss.portal.portlet.impl.state.producer.ProducerPersistenceManagerService;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.state.consumer.ConsumerPortletInvoker;
 import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
-import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.test.ActionContextImpl;
+import org.jboss.portal.portlet.test.InstanceContextImpl;
 import org.jboss.portal.portlet.test.support.PortletInvokerSupport;
 import org.jboss.portal.portlet.test.support.PortletSupport;
-import org.jboss.portal.portlet.test.ActionContextImpl;
-import org.jboss.portal.portlet.test.InstanceContextImpl;
+import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
-import java.util.List;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreConsumerStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreConsumerStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreConsumerStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/LocalStoreProducerStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
 import org.jboss.portal.portlet.invocation.ActionInvocation;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,47 +1,48 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
-import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
+import org.jboss.portal.portlet.Portlet;
 import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.impl.state.StateConverterService;
+import org.jboss.portal.portlet.impl.state.StateManagementPolicyService;
+import org.jboss.portal.portlet.impl.state.producer.ProducerPersistenceManagerService;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.state.AccessMode;
 import org.jboss.portal.portlet.state.PropertyChange;
 import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
-import org.jboss.portal.portlet.impl.state.producer.ProducerPersistenceManagerService;
-import org.jboss.portal.portlet.impl.state.StateManagementPolicyService;
-import org.jboss.portal.portlet.impl.state.StateConverterService;
+import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
+import org.jboss.portal.portlet.test.ActionContextImpl;
+import org.jboss.portal.portlet.test.InstanceContextImpl;
 import org.jboss.portal.portlet.test.support.PortletInvokerSupport;
 import org.jboss.portal.portlet.test.support.PortletSupport;
 import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
-import org.jboss.portal.portlet.test.ActionContextImpl;
-import org.jboss.portal.portlet.test.InstanceContextImpl;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
-import java.util.List;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreConsumerStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreConsumerStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreConsumerStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
 /**

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/RemoteStoreProducerStatefulPortletInvokerTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
 import org.jboss.portal.portlet.invocation.ActionInvocation;

Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/state/StateConverterV0TestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.portlet.state;
 
-import org.jboss.portal.portlet.state.producer.ProducerState;
-import org.jboss.portal.portlet.state.StateConverter;
+import junit.framework.TestCase;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.portlet.impl.state.StateConverterV0;
 import org.jboss.portal.portlet.state.PropertyMap;
 import org.jboss.portal.portlet.state.SimplePropertyMap;
 import org.jboss.portal.portlet.state.StateConversionException;
-import org.jboss.portal.portlet.impl.state.StateConverterV0;
+import org.jboss.portal.portlet.state.StateConverter;
+import org.jboss.portal.portlet.state.producer.ProducerState;
 import org.jboss.portal.portlet.test.ValueMapAssert;
-import org.jboss.portal.common.value.StringValue;
-import junit.framework.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -101,9 +102,9 @@
       props.setProperty("ef", new StringValue(new String[0]));
       props.setProperty("gh", new StringValue(new String[]{""}));
       props.setProperty("ij", new StringValue(new String[]{"kl"}));
-      props.setProperty("mn", new StringValue(new String[]{"op",null}));
-      props.setProperty("qr", new StringValue(new String[]{null,"st"}));
-      props.setProperty("uv", new StringValue(new String[]{"wx",null,"yz"}));
+      props.setProperty("mn", new StringValue(new String[]{"op", null}));
+      props.setProperty("qr", new StringValue(new String[]{null, "st"}));
+      props.setProperty("uv", new StringValue(new String[]{"wx", null, "yz"}));
       assertWorks(new ProducerState("bar", props));
    }
 

Modified: trunk/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/main/org/jboss/portal/test/server/ContentTypesTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.server;
 

Modified: trunk/portlet/src/resources/samples-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/samples-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/samples-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
    <portlet>
       <description>default</description>
       <description xml:lang="fr">defaut</description>

Modified: trunk/portlet/src/resources/samples-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/samples-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/samples-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app>
 </web-app>
\ No newline at end of file

Modified: trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/tck-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server stack -->
@@ -141,8 +164,10 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="Producer" proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
-      <depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=Consumer</depends>
+      <depends optional-attribute-name="Producer"
+               proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
+      <depends optional-attribute-name="Stack"
+               proxy-type="attribute">portal:service=InterceptorStack,type=Consumer</depends>
    </mbean>
 
    <!-- The producer portlet invoker -->
@@ -153,7 +178,8 @@
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
       <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Container</depends>
-      <depends optional-attribute-name="StateStore" proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
+      <depends optional-attribute-name="StateStore"
+               proxy-type="attribute">portal:service=StateStore,type=Producer</depends>
    </mbean>
 
    <!-- The container portlet invoker -->
@@ -163,7 +189,8 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="Stack" proxy-type="attribute">portal:service=InterceptorStack,type=Container</depends>
+      <depends optional-attribute-name="Stack"
+               proxy-type="attribute">portal:service=InterceptorStack,type=Container</depends>
       <depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>
    </mbean>
 
@@ -208,15 +235,15 @@
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
    </mbean>
-<!--
-   <mbean
-      code="org.jboss.portal.portlet.test.TestConsumerStateStore"
-      name="portal:service=StateStore,type=Consumer"
-      xmbean-dd=""
-      xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
-      <xmbean/>
-   </mbean>
--->
+   <!--
+      <mbean
+         code="org.jboss.portal.portlet.test.TestConsumerStateStore"
+         name="portal:service=StateStore,type=Consumer"
+         xmbean-dd=""
+         xmbean-code="org.jboss.portal.common.system.JBossServiceModelMBean">
+         <xmbean/>
+      </mbean>
+   -->
 
    <!-- Portal security services-->
    <mbean

Modified: trunk/portlet/src/resources/tck-sar/conf/config.xml
===================================================================
--- trunk/portlet/src/resources/tck-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/tck-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
    <entry key="blah">bluh</entry>
 </properties>

Modified: trunk/portlet/src/resources/test/deployment/jboss-portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/deployment/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/deployment/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <remotable>true</remotable>
    <portlet>

Modified: trunk/portlet/src/resources/test/deployment/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/deployment/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/deployment/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
    <portlet>
       <description>default</description>
       <description xml:lang="fr">defaut</description>

Modified: trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"

Modified: trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"

Modified: trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/ha/test-session-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
    <listener>
       <listener-class>org.jboss.portal.test.portlet.ha.session.SessionSequenceBuilder</listener-class>
    </listener>

Modified: trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server -->

Modified: trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/jboss-portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app>
    <remotable>true</remotable>
    <portlet>

Modified: trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
    <portlet>
       <portlet-name>NoBundlePortlet</portlet-name>
       <portlet-class>org.jboss.portal.test.portlet.info.universal.SimplePortlet</portlet-class>

Modified: trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/info/test-info-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/actionresponse-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portalcontext-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletconfig-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletcontext-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletmode-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletpreferences-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletsession-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portletsessionutil-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/portleturl-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/renderrequest-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/renderresponse-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/api/windowstate-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/dispatcher-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
    <portlet>
       <portlet-name>ResourceBundlePortlet</portlet-name>
       <portlet-class>org.jboss.portal.test.portlet.jsr168.ext.portletconfig.extended.ResourceBundlePortlet</portlet-class>

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletconfig-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletmode-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletrequests-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/portletresponses-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>UniversalTestPortletB</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/preferences-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>UniversalTestPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/ext/session-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>UniversalTestPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/misc/log4j-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"

Modified: trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/basic-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app version="2.4"
          xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
    <listener>
       <listener-class>org.jboss.portal.test.framework.portlet.basictests.BasicTestSequenceBuilder</listener-class>
    </listener>

Modified: trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/dispatcher-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
    <portlet>
       <portlet-name>InlineValuesNotInResourceBundlePortlet</portlet-name>
       <portlet-class>org.jboss.portal.test.portlet.jsr168.tck.portletconfig.spec.InlineValuesNotInResourceBundlePortlet</portlet-class>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletconfig-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>TestUniversalPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletcontext-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>UniversalTestPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletinterface-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <!--Spec Assertions related portlets-->

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletmode-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletrequests-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletresponses-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
    <portlet>
       <portlet-name>UniversalTestPortletA</portlet-name>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portletsession-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
     <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/portleturl-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/preferences-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/portlet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0">
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             version="1.0">
 
 
    <portlet>

Modified: trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test/jsr168/tck/windowstates-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server stack -->
@@ -139,7 +162,8 @@
       xmbean-dd=""
       xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
       <xmbean/>
-      <depends optional-attribute-name="Producer" proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
+      <depends optional-attribute-name="Producer"
+               proxy-type="attribute">portal:service=PortletInvoker,type=Producer</depends>
       <depends optional-attribute-name="StackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Consumer</depends>
    </mbean>
 

Modified: trunk/portlet/src/resources/test-sar/conf/config.xml
===================================================================
--- trunk/portlet/src/resources/test-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
    <entry key="blah">bluh</entry>
 </properties>

Modified: trunk/portlet/src/resources/test-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/portlet/src/resources/test-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
    <security-domain>java:/jaas/other</security-domain>
    <replication-config>

Modified: trunk/portlet/src/resources/test-war/WEB-INF/web.xml
===================================================================
--- trunk/portlet/src/resources/test-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/portlet/src/resources/test-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">
@@ -27,31 +50,31 @@
       </security-role-ref>
    </servlet>
 
-<!--
-   <servlet>
-      <servlet-name>PortalServletNoRedirect</servlet-name>
-      <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
-      <init-param>
-         <param-name>asDefaultServlet</param-name>
-         <param-value>false</param-value>
-         <description>The servlet needs to know wether it is set as a default servlet or not</description>
-      </init-param>
-      <init-param>
-         <param-name>controllerName</param-name>
-         <param-value>portal:controller=Request,redirect=false</param-value>
-         <description>The request controller for the portal servlet</description>
-      </init-param>
-      <load-on-startup>0</load-on-startup>
-      <security-role-ref>
-        <role-name>Test</role-name>
-        <role-link>Test</role-link>
-      </security-role-ref>
-   </servlet>
-   <servlet-mapping>
-      <servlet-name>PortalServletNoRedirect</servlet-name>
-      <url-pattern>/noredirect/*</url-pattern>
-   </servlet-mapping>
--->
+   <!--
+      <servlet>
+         <servlet-name>PortalServletNoRedirect</servlet-name>
+         <servlet-class>org.jboss.portal.server.servlet.PortalServlet</servlet-class>
+         <init-param>
+            <param-name>asDefaultServlet</param-name>
+            <param-value>false</param-value>
+            <description>The servlet needs to know wether it is set as a default servlet or not</description>
+         </init-param>
+         <init-param>
+            <param-name>controllerName</param-name>
+            <param-value>portal:controller=Request,redirect=false</param-value>
+            <description>The request controller for the portal servlet</description>
+         </init-param>
+         <load-on-startup>0</load-on-startup>
+         <security-role-ref>
+           <role-name>Test</role-name>
+           <role-link>Test</role-link>
+         </security-role-ref>
+      </servlet>
+      <servlet-mapping>
+         <servlet-name>PortalServletNoRedirect</servlet-name>
+         <url-pattern>/noredirect/*</url-pattern>
+      </servlet-mapping>
+   -->
 
    <!-- Provide access to unauthenticated users -->
    <servlet-mapping>

Modified: trunk/security/build.xml
===================================================================
--- trunk/security/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,12 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
-  <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
-  <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-  <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
-  <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
-  <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
-  <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
-]>
+   <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
+   <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
+   <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
+   <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
+   ]>
 
 <!-- $Id$ -->
 
@@ -31,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;  
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -63,7 +86,7 @@
       <property name="junit.formatter.usefile" value="true"/>
 
       <!-- Configure thirdparty libraries -->
-       &libraries;
+      &libraries;
       <path id="library.classpath">
          <path refid="oswego.concurrent.classpath"/>
          <path refid="jbossas/core.libs.classpath"/>
@@ -73,7 +96,7 @@
       </path>
 
       <!-- Configure modules -->
-     <call target="configure-modules"/>
+      <call target="configure-modules"/>
       <path id="dependentmodule.classpath">
          <path refid="jboss.portal-common.classpath"/>
          <path refid="jboss.portal-jems.classpath"/>
@@ -104,8 +127,8 @@
    <!--+====================================================================+-->
 
    <target name="compile"
-      description="Compile all source files."
-      depends="_default:compile-classes,
+           description="Compile all source files."
+           depends="_default:compile-classes,
                _default:compile-etc,
                _default:compile-resources">
       <!-- Add module specific elements here. -->
@@ -120,8 +143,8 @@
    <!--+====================================================================+-->
 
    <target name="output"
-      description="Generate all target output."
-      depends="compile">
+           description="Generate all target output."
+           depends="compile">
 
       <!-- -->
       <mkdir dir="${build.lib}"/>
@@ -138,10 +161,10 @@
          <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
       </jar>
    </target>
-	
-	<!-- generates artifacts used for tests, requires output to be previously run -->
-	<target name="package-tests" depends="init"/>
 
+   <!-- generates artifacts used for tests, requires output to be previously run -->
+   <target name="package-tests" depends="init"/>
+
    <!-- ================================================================== -->
    <!-- Cleaning                                                           -->
    <!-- ================================================================== -->

Modified: trunk/security/imports/test-jars.xml
===================================================================
--- trunk/security/imports/test-jars.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/imports/test-jars.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,5 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!-- ============================================================ -->
 <!--  JBoss, the OpenSource J2EE webOS                            -->
 <!--  Distributable under LGPL license.                           -->
@@ -12,12 +35,12 @@
 
   <description>Portal test archive builder</description>
 
-  <!-- ================================================================== -->
-  <!-- Building                                                           -->
-  <!-- ================================================================== -->
+   <!-- ================================================================== -->
+   <!-- Building                                                           -->
+   <!-- ================================================================== -->
 
-  <target name="build-jars" description="Build the deployments.">
-    <mkdir dir="${build.lib}/test" />
+   <target name="build-jars" description="Build the deployments.">
+    <mkdir dir="${build.lib}/test"/>
   </target>
   
 </project>

Modified: trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/AuthorizationDomainRegistry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security;
 
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;

Modified: trunk/security/src/main/org/jboss/portal/security/PortalPermission.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/PortalPermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/PortalPermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security;
 
 import org.jboss.portal.security.spi.provider.PermissionRepository;
@@ -67,27 +68,19 @@
       this.collection = null;
    }
 
-   /**
-    * Return the uri for the permission or null if the
-    * permission acts as a container.
-    */
+   /** Return the uri for the permission or null if the permission acts as a container. */
    public String getURI()
    {
       return uri;
    }
 
-   /**
-    * Return an instance of PortalPermissionCollection or null
-    * if the permission does not act as a container.
-    */
+   /** Return an instance of PortalPermissionCollection or null if the permission does not act as a container. */
    public PermissionCollection newPermissionCollection()
    {
       return collection;
    }
 
-   /**
-    * Return true if the permission is a container.
-    */
+   /** Return true if the permission is a container. */
    public boolean isContainer()
    {
       return uri == null;

Modified: trunk/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/PortalPermissionCollection.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security;
 
+import org.apache.log4j.Logger;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 import org.jboss.portal.security.spi.provider.PermissionRepository;
-import org.apache.log4j.Logger;
 
 import javax.security.auth.Subject;
-import java.security.PermissionCollection;
 import java.security.Permission;
+import java.security.PermissionCollection;
 import java.util.Enumeration;
 
 /**
- * This class is a litteral reference to a portal permission repository.
- * Subclasses should implement the implies logic and leverage the repository
- * to get the role.
+ * This class is a litteral reference to a portal permission repository. Subclasses should implement the implies logic
+ * and leverage the repository to get the role.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -66,8 +66,8 @@
    }
 
    /**
-    * The only time this method is called is when JACC creates an instance of this object
-    * in order to add the owner permission to the collection.
+    * The only time this method is called is when JACC creates an instance of this object in order to add the owner
+    * permission to the collection.
     *
     * @throws IllegalArgumentException if the added permission is not the owner of this collection
     */
@@ -80,9 +80,8 @@
    }
 
    /**
-    * This implementation delegates to the container permission associated with
-    * this collection the logic of the check against the repository using the
-    * method PortalPermission#implies(AuthorizationDomain,String,PortalPermission).
+    * This implementation delegates to the container permission associated with this collection the logic of the check
+    * against the repository using the method PortalPermission#implies(AuthorizationDomain,String,PortalPermission).
     */
    public boolean implies(Permission permission)
    {

Modified: trunk/security/src/main/org/jboss/portal/security/PortalSecurityException.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/PortalSecurityException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/PortalSecurityException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security;
 
 /**

Modified: trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/RoleSecurityBinding.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,38 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security;
 
 import java.io.Serializable;
-import java.util.Set;
 import java.util.Collections;
-import java.util.StringTokenizer;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
+import java.util.StringTokenizer;
 
 /**
- * Binds a role and a set of actions together. This object is immutable.
- * <p>A portal resource (portal, page, window, instance, portlet...) is secured via a set of security constraints.
- * each security constraint holds the information about what roles are allowed what actions.</p>
+ * Binds a role and a set of actions together. This object is immutable. <p>A portal resource (portal, page, window,
+ * instance, portlet...) is secured via a set of security constraints. each security constraint holds the information
+ * about what roles are allowed what actions.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -56,13 +57,13 @@
    private transient int hashCode;
 
    /** The cached actions as a string. */
-   private transient String actionsAsString; 
+   private transient String actionsAsString;
 
    /**
     * Create a new constraint with the provided actions for the specified role.
     *
     * @param actions a comma separated list of allowed actions
-    * @param role the role name
+    * @param role    the role name
     */
    public RoleSecurityBinding(String actions, String role)
    {
@@ -92,7 +93,7 @@
     * Create a new constraint with the provided actions and the specified role.
     *
     * @param actions the set of actions
-    * @param role the role name
+    * @param role    the role name
     */
    public RoleSecurityBinding(Set actions, String role)
    {
@@ -110,9 +111,7 @@
       this.actions = Collections.unmodifiableSet(new HashSet(actions));
    }
 
-   /**
-    * Copy constructor.
-    */
+   /** Copy constructor. */
    public RoleSecurityBinding(RoleSecurityBinding other)
    {
       if (other == null)
@@ -155,7 +154,7 @@
       if (actionsAsString == null)
       {
          StringBuffer tmp = new StringBuffer();
-         for (Iterator i = actions.iterator();i.hasNext();)
+         for (Iterator i = actions.iterator(); i.hasNext();)
          {
             String action = (String)i.next();
             if (i.hasNext())
@@ -169,15 +168,13 @@
       return actionsAsString;
    }
 
-   /**
-    * @see Object#toString
-    */
+   /** @see Object#toString */
    public String toString()
    {
       if (toString == null)
       {
          StringBuffer tmp = new StringBuffer("SecurityConstraint: actions [");
-         for (Iterator i = actions.iterator();i.hasNext();)
+         for (Iterator i = actions.iterator(); i.hasNext();)
          {
             String action = (String)i.next();
             if (i.hasNext())

Modified: trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/SecurityConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security;
 
 /**
@@ -28,19 +29,12 @@
  */
 public interface SecurityConstants
 {
-   /**
-    * Define the special role name that significate that a permission is unchecked.
-    */
+   /** Define the special role name that significate that a permission is unchecked. */
    String UNCHECKED_ROLE_NAME = "__unchecked__".intern();
 
-   /**
-    * The mandatory role name for each authenticated user.
-    */
+   /** The mandatory role name for each authenticated user. */
    String AUTHENTICATED_ROLE_NAME = "Authenticated".intern();
 
-   /**
-    * An identifier that is added to the action in a permission
-    * to represent a recursive permission.
-    */
+   /** An identifier that is added to the action in a permission to represent a recursive permission. */
    String PERMISSION_RECURSIVE_IDENTIFIER = "recursive".intern();
 }

Modified: trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistry.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.impl;
 
 import org.jboss.portal.security.AuthorizationDomainRegistry;
@@ -33,13 +34,9 @@
  */
 public interface JBossAuthorizationDomainRegistry extends AuthorizationDomainRegistry
 {
-   /**
-    * Add a policy.
-    */
+   /** Add a policy. */
    void addDomain(AuthorizationDomain domain);
 
-   /**
-    * Remove a policy
-    */
+   /** Remove a policy */
    void removeDomain(AuthorizationDomain domain);
 }

Modified: trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/impl/JBossAuthorizationDomainRegistryImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.impl;
 
-import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * MBean to allow access to the policy config service and the policy configs stored within.
@@ -38,9 +39,7 @@
 public class JBossAuthorizationDomainRegistryImpl extends AbstractJBossService implements JBossAuthorizationDomainRegistry
 {
 
-   /**
-    * A map of permission types to stores.
-    */
+   /** A map of permission types to stores. */
    private Map domains = new HashMap();
 
    public void addDomain(AuthorizationDomain domain)

Modified: trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,49 +1,49 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.impl.jacc;
 
 import org.jboss.logging.Logger;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.security.PortalPermission;
+import org.jboss.portal.security.PortalSecurityException;
 import org.jboss.portal.security.SecurityConstants;
-import org.jboss.portal.security.PortalSecurityException;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
 import org.jboss.portal.security.spi.provider.PermissionFactory;
 
+import javax.security.auth.Subject;
 import javax.security.jacc.PolicyConfiguration;
+import javax.security.jacc.PolicyConfigurationFactory;
 import javax.security.jacc.PolicyContext;
-import javax.security.jacc.PolicyConfigurationFactory;
-import javax.security.auth.Subject;
+import java.security.Policy;
+import java.security.Principal;
 import java.security.ProtectionDomain;
-import java.security.Principal;
-import java.security.Policy;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Collection;
 import java.util.Set;
 
 /**
- * Portal Authorization Manager based on JACC
- * Has deep integration with the JBossSX Jacc Layer.
+ * Portal Authorization Manager based on JACC Has deep integration with the JBossSX Jacc Layer.
  *
  * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -149,7 +149,7 @@
       {
          Set tmp = currentSubject.getPrincipals(JACCPortalPrincipal.class);
          JACCPortalPrincipal pp = null;
-         for (Iterator i = tmp.iterator();i.hasNext();)
+         for (Iterator i = tmp.iterator(); i.hasNext();)
          {
             pp = (JACCPortalPrincipal)i.next();
             if (pp != null)

Modified: trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalAuthorizationManagerFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.impl.jacc;
 
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
-import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.security.AuthorizationDomainRegistry;
 import org.jboss.portal.security.PortalPermission;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.security.jacc.SubjectPolicyContextHandler;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
 import org.jboss.security.jacc.DelegatingPolicy;
+import org.jboss.security.jacc.SubjectPolicyContextHandler;
 
 import javax.security.jacc.PolicyContext;
-import java.util.Map;
-import java.util.HashMap;
 import java.security.Policy;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -63,9 +64,7 @@
       return new JACCPortalAuthorizationManager(this);
    }
 
-   /**
-    * Set the PolicyContext subject security handler and the delegating policy. 
-    */
+   /** Set the PolicyContext subject security handler and the delegating policy. */
    protected void startService() throws Exception
    {
       // Set up the mandatory context handler

Modified: trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPermissionCollection.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.impl.jacc;
 
 import org.jboss.portal.security.PortalPermissionCollection;

Modified: trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/impl/jacc/JACCPortalPrincipal.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.impl.jacc;
 
 import javax.security.auth.Subject;
 import java.security.Principal;
 import java.security.acl.Group;
-import java.util.Set;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.Enumeration;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
- * This principal purpose is to cache some computation necessary to make the portal JACC integration work. 
+ * This principal purpose is to cache some computation necessary to make the portal JACC integration work.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -58,7 +59,7 @@
          if (principal instanceof Group)
          {
             Group group = (Group)principal;
-            for (Enumeration e = group.members();e.hasMoreElements();)
+            for (Enumeration e = group.members(); e.hasMoreElements();)
             {
                Principal nestedPrincipal = (Principal)e.nextElement();
                principals.add(nestedPrincipal);
@@ -66,7 +67,7 @@
             if ("Roles".equals(group.getName()))
             {
                roles = new HashSet();
-               for (Enumeration e = group.members();e.hasMoreElements();)
+               for (Enumeration e = group.members(); e.hasMoreElements();)
                {
                   Principal role = (Principal)e.nextElement();
                   roles.add(role);

Modified: trunk/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/metadata/SecurityConstraintsMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.metadata;
 
-import org.w3c.dom.Element;
 import org.jboss.portal.common.util.XML;
 import org.jboss.portal.security.RoleSecurityBinding;
 import org.jboss.portal.security.SecurityConstants;
+import org.w3c.dom.Element;
 
-import java.util.Set;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -37,9 +38,7 @@
 public class SecurityConstraintsMetaData
 {
 
-   /**
-    * .
-    */
+   /** . */
    private Set children;
 
    public SecurityConstraintsMetaData()
@@ -55,12 +54,12 @@
    public static SecurityConstraintsMetaData buildSecurityConstraintMetaData(Element securityConstraintElt)
    {
       SecurityConstraintsMetaData securityConstraint = new SecurityConstraintsMetaData();
-      for (Iterator i = XML.getChildren(securityConstraintElt, "policy-permission").iterator();i.hasNext();)
+      for (Iterator i = XML.getChildren(securityConstraintElt, "policy-permission").iterator(); i.hasNext();)
       {
          Element policyPermissionElt = (Element)i.next();
          Element uncheckedElt = XML.getUniqueChild(policyPermissionElt, "unchecked", false);
          Set actionNames = new HashSet();
-         for (Iterator j = XML.getChildren(policyPermissionElt, "action-name").iterator();j.hasNext();)
+         for (Iterator j = XML.getChildren(policyPermissionElt, "action-name").iterator(); j.hasNext();)
          {
             Element actionNameElt = (Element)j.next();
             String actionName = XML.asString(actionNameElt);
@@ -73,7 +72,7 @@
          }
          else
          {
-            for (Iterator j = XML.getChildren(policyPermissionElt, "role-name").iterator();j.hasNext();)
+            for (Iterator j = XML.getChildren(policyPermissionElt, "role-name").iterator(); j.hasNext();)
             {
                Element roleNameElt = (Element)j.next();
                String roleName = XML.asString(roleNameElt);

Modified: trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.auth;
 
+import org.jboss.portal.security.PortalPermission;
 import org.jboss.portal.security.PortalSecurityException;
-import org.jboss.portal.security.PortalPermission;
 
 /**
  * Portal Authorization Management Interface
@@ -33,7 +34,6 @@
 public interface PortalAuthorizationManager
 {
    /**
-    * 
     * @param permission
     * @return
     * @throws PortalSecurityException

Modified: trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/auth/PortalAuthorizationManagerFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,26 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.auth;
- 
+
 import org.jboss.portal.security.PortalSecurityException;
 
 /**

Modified: trunk/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/provider/AuthorizationDomain.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.provider;
 
 /**
@@ -28,24 +29,16 @@
  * @version $Revision$
  */
 public interface AuthorizationDomain
-{  
-   /**
-    * The domain type.
-    */
+{
+   /** The domain type. */
    String getType();
 
-   /**
-    * The domain configurator.
-    */
+   /** The domain configurator. */
    DomainConfigurator getConfigurator();
 
-   /**
-    * The permission factory.
-    */
+   /** The permission factory. */
    PermissionRepository getPermissionRepository();
 
-   /**
-    * The permission repository.
-    */
+   /** The permission repository. */
    PermissionFactory getPermissionFactory();
 }

Modified: trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/provider/DomainConfigurator.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.provider;
 
 import java.util.Set;

Modified: trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.provider;
 
 import org.jboss.portal.security.PortalPermission;

Modified: trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/provider/PermissionRepository.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.provider;
 
 import org.jboss.portal.security.PortalPermission;
@@ -32,8 +33,6 @@
  */
 public interface PermissionRepository
 {
-   /**
-    * Load a permission from the repository.
-    */
+   /** Load a permission from the repository. */
    PortalPermission getPermission(String roleName, String uri) throws PortalSecurityException;
 }

Modified: trunk/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/security/spi/provider/SecurityConfigurationException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.security.spi.provider;
 
 import org.jboss.portal.security.PortalSecurityException;

Modified: trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/BaseAuthorizationDomain.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import org.jboss.portal.security.PortalPermission;
+import org.jboss.portal.security.PortalSecurityException;
+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.spi.provider.PermissionRepository;
 import org.jboss.portal.security.spi.provider.SecurityConfigurationException;
-import org.jboss.portal.security.RoleSecurityBinding;
-import org.jboss.portal.security.spi.provider.PermissionRepository;
-import org.jboss.portal.security.PortalPermission;
-import org.jboss.portal.security.PortalSecurityException;
 
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
-import java.util.Map;
-import java.util.Iterator;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/ComplexTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import junit.framework.TestCase;
+import org.jboss.portal.security.RoleSecurityBinding;
+import org.jboss.portal.security.SecurityConstants;
 import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl;
 import org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
 import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
-import org.jboss.portal.security.RoleSecurityBinding;
-import org.jboss.portal.security.SecurityConstants;
 
 import java.util.Collections;
 
@@ -122,7 +123,7 @@
             PortalAuthorizationManager manager = factory.getManager();
 
             //
-            server.associateRoles(new String[]{"user","admin"});
+            server.associateRoles(new String[]{"user", "admin"});
             assertTrue(manager.checkPermission(new FlatPermission("_admin")));
             assertTrue(manager.checkPermission(new FlatPermission("_user")));
          }

Modified: trunk/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/DomainImplyFailsPermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import org.jboss.portal.security.PortalPermission;
@@ -33,10 +34,10 @@
  * @version $Revision$
  */
 public class DomainImplyFailsPermission extends FlatPermission
-{ 
+{
    /** The serialVersionUID */
    private static final long serialVersionUID = 4177540038051809987L;
-   
+
    /** What we throw. */
    private Throwable throwable;
 
@@ -55,15 +56,15 @@
    {
       if (throwable instanceof PortalSecurityException)
       {
-         throw (PortalSecurityException)throwable;
+         throw(PortalSecurityException)throwable;
       }
       else if (throwable instanceof RuntimeException)
       {
-         throw (RuntimeException)throwable;
+         throw(RuntimeException)throwable;
       }
       else
       {
-         throw (Error)throwable;
+         throw(Error)throwable;
       }
    }
 

Modified: trunk/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/FlatAuthorizationDomain.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import org.jboss.portal.security.PortalPermission;

Modified: trunk/security/src/main/org/jboss/portal/test/security/FlatPermission.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/FlatPermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/FlatPermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import org.jboss.portal.security.PortalPermission;

Modified: trunk/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/HierarchyAuthorizationDomain.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import org.jboss.portal.security.PortalPermission;

Modified: trunk/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/HierarchyPermission.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import org.jboss.portal.security.PortalPermission;

Modified: trunk/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/PortalPermissionTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import junit.framework.TestCase;
 import org.jboss.portal.security.PortalPermission;
 
+import javax.security.jacc.PolicyConfiguration;
 import javax.security.jacc.PolicyConfigurationFactory;
-import javax.security.jacc.PolicyConfiguration;
+import java.security.Policy;
 import java.security.Principal;
 import java.security.ProtectionDomain;
-import java.security.Policy;
 
 /**
  * A test case to extend to perform testing of portal permission subclasses.

Modified: trunk/security/src/main/org/jboss/portal/test/security/Server.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/Server.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/Server.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
-import org.jboss.security.jacc.SubjectPolicyContextHandler;
-import org.jboss.security.jacc.DelegatingPolicy;
+import org.jboss.portal.security.PortalPermission;
+import org.jboss.security.SecurityAssociation;
 import org.jboss.security.SimpleGroup;
 import org.jboss.security.SimplePrincipal;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.portal.security.PortalPermission;
+import org.jboss.security.jacc.DelegatingPolicy;
+import org.jboss.security.jacc.SubjectPolicyContextHandler;
 
+import javax.security.auth.Subject;
 import javax.security.jacc.PolicyContext;
-import javax.security.auth.Subject;
 import java.security.Policy;
 import java.security.Principal;
 import java.security.acl.Group;

Modified: trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java
===================================================================
--- trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/main/org/jboss/portal/test/security/SimpleTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.security;
 
 import org.jboss.portal.security.PortalPermissionCollection;
 import org.jboss.portal.security.PortalSecurityException;
 import org.jboss.portal.security.RoleSecurityBinding;
+import org.jboss.portal.security.impl.jacc.JACCPortalPermissionCollection;
 import org.jboss.portal.security.spi.provider.AuthorizationDomain;
-import org.jboss.portal.security.impl.jacc.JACCPortalPermissionCollection;
 import org.jboss.security.SimplePrincipal;
 
 import java.security.Principal;

Modified: trunk/security/src/resources/log4j.xml
===================================================================
--- trunk/security/src/resources/log4j.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/security/src/resources/log4j.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <!-- ===================================================================== -->
@@ -17,70 +40,70 @@
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
 
   <!-- ================================= -->
-  <!-- Preserve messages in a local file -->
-  <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
 
-  <!-- A time/date based rolling appender -->
-  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+   <!-- A time/date based rolling appender -->
+   <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
     <param name="File" value="${build.testlog}/test.log"/>
     <param name="Append" value="true"/>
 
-    <!-- Rollover at midnight each day -->
-    <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+      <!-- Rollover at midnight each day -->
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
 
-    <!-- Rollover at the top of each hour
-    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
-    -->
+      <!-- Rollover at the top of each hour
+      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+      -->
 
-    <layout class="org.apache.log4j.PatternLayout">
+      <layout class="org.apache.log4j.PatternLayout">
       <!-- The default pattern: Date Priority [Category] Message\n -->
-      <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
 
-      <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
-      <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
-       -->
+         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+        <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+         -->
     </layout>	    
   </appender>
 
 
-  <!-- ============================== -->
-  <!-- Append messages to the console -->
-  <!-- ============================== -->
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
 
-  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+   <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
     <param name="Threshold" value="DEBUG"/>
     <param name="Target" value="System.out"/>
 
     <layout class="org.apache.log4j.PatternLayout">
       <!-- The default pattern: Date Priority [Category] Message\n -->
-      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+       <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
     </layout>
   </appender>
 
-  <!-- ================ -->
-  <!-- Limit categories -->
-  <!-- ================ -->
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
 
-  <!-- Limit JBoss categories to INFO 
-  <category name="org.jboss">
-    <priority value="INFO" class="org.jboss.logging.XLevel"/>
-  </category>
-  -->
+   <!-- Limit JBoss categories to INFO
+   <category name="org.jboss">
+     <priority value="INFO" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
 
-  <!-- Increase the priority threshold for the DefaultDS category
-  <category name="DefaultDS">
-    <priority value="FATAL"/>
-  </category>
-  -->
+   <!-- Increase the priority threshold for the DefaultDS category
+   <category name="DefaultDS">
+     <priority value="FATAL"/>
+   </category>
+   -->
 
-  <!-- Decrease the priority threshold for the org.jboss.varia category
-  <category name="org.jboss.varia">
+   <!-- Decrease the priority threshold for the org.jboss.varia category
+   <category name="org.jboss.varia">
+     <priority value="DEBUG"/>
+   </category>
+   -->
+   <category name="org.jboss.ws">
     <priority value="DEBUG"/>
   </category>
-  -->
-  <category name="org.jboss.ws">
-    <priority value="DEBUG"/>
-  </category>
 
   <category name="org.jboss.util.xml">
     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
@@ -93,24 +116,24 @@
     <priority value="DEBUG"/>
   </category>
 
-  <!--
-     | An example of enabling the custom TRACE level priority that is used
-     | by the JBoss internals to diagnose low level details. This example
-     | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
-     | subpackages. This will produce A LOT of logging output.
-  <category name="org.jboss.system">
-    <priority value="TRACE" class="org.jboss.logging.XLevel"/>
-  </category>
-  -->
+   <!--
+      | An example of enabling the custom TRACE level priority that is used
+      | by the JBoss internals to diagnose low level details. This example
+      | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+      | subpackages. This will produce A LOT of logging output.
+   <category name="org.jboss.system">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category>
+   -->
 
-  <!--category name="org.jboss.tm">
-    <priority value="TRACE" class="org.jboss.logging.XLevel"/>
-  </category-->
-  <!-- ======================= -->
-  <!-- Setup the Root category -->
-  <!-- ======================= -->
+   <!--category name="org.jboss.tm">
+     <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+   </category-->
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
 
-  <root>
+   <root>
     <appender-ref ref="FILE"/>
   </root>
   

Modified: trunk/server/build.xml
===================================================================
--- trunk/server/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">  
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
    <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
@@ -31,7 +54,7 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
@@ -133,15 +156,15 @@
    <!--| modules.                                                           |-->
    <!--+====================================================================+-->
 
-	<target name="output"
-	           description="Generate all target output."
-	           depends="compile">
+   <target name="output"
+           description="Generate all target output."
+           depends="compile">
 
 	      <!-- -->
-	      <mkdir dir="${build.lib}"/>
+      <mkdir dir="${build.lib}"/>
 
-	      <!-- -->
-	      <jar jarfile="${build.lib}/portal-server-lib.jar">
+      <!-- -->
+      <jar jarfile="${build.lib}/portal-server-lib.jar">
 	         <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
 	      </jar>    
 
@@ -157,10 +180,10 @@
 	         <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/>
 	       </jar>
 	   </target>
-	   
-	   <!-- generates artifacts used for tests, requires output to be previously run -->
-	   <target name="package-tests" depends="init"> 
 
+   <!-- generates artifacts used for tests, requires output to be previously run -->
+   <target name="package-tests" depends="init">
+
 	      <jar jarfile="${build.lib}/test-agent.war">
 	         <fileset dir="${build.resources}/test-agent-war"/>
 	      </jar>
@@ -251,8 +274,8 @@
    </target>
 
    <target name="undeploy"
-      description="Undeploy."
-      depends="init">
+           description="Undeploy."
+           depends="init">
       <require file="${jboss.home}/server/${portal.deploy.dir}"/>
       <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-server.sar"/>
    </target>

Modified: trunk/server/src/main/org/jboss/portal/server/AbstractServerURL.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/AbstractServerURL.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/AbstractServerURL.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import org.jboss.portal.common.util.Tools;
 
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/PortalConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/PortalConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import org.jboss.portal.common.util.Version;

Modified: trunk/server/src/main/org/jboss/portal/server/RequestController.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/RequestController.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/RequestController.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 /**
- * The server delegates to the request controller the handling of the invocation after it has been through the interceptor
- * stack of the server.
+ * The server delegates to the request controller the handling of the invocation after it has been through the
+ * interceptor stack of the server.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/RequestControllerDispatcher.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
-import org.jboss.portal.common.invocation.InvocationHandler;
 import org.jboss.portal.common.invocation.Invocation;
 import org.jboss.portal.common.invocation.InvocationException;
+import org.jboss.portal.common.invocation.InvocationHandler;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/server/Server.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/Server.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/Server.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
-import org.jboss.portal.server.config.ServerConfig;
 import org.jboss.portal.common.util.Version;
+import org.jboss.portal.server.config.ServerConfig;
 
 /**
  * The portal server.
@@ -32,13 +33,9 @@
  */
 public interface Server
 {
-   /**
-    * Return the config of this server.
-    */
+   /** Return the config of this server. */
    ServerConfig getConfig();
 
-   /**
-    * Return the server version. 
-    */
+   /** Return the server version. */
    Version getVersion();
 }

Modified: trunk/server/src/main/org/jboss/portal/server/ServerException.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 /**

Modified: trunk/server/src/main/org/jboss/portal/server/ServerInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import org.jboss.portal.common.invocation.Invocation;

Modified: trunk/server/src/main/org/jboss/portal/server/ServerInvocation.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerInvocation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerInvocation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import org.jboss.portal.common.invocation.Invocation;

Modified: trunk/server/src/main/org/jboss/portal/server/ServerInvocationContext.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerInvocationContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerInvocationContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import org.jboss.portal.common.invocation.InvocationContext;
@@ -35,9 +36,7 @@
  */
 public interface ServerInvocationContext extends InvocationContext
 {
-   /**
-    * Return the request that made the connection to the server.
-    */
+   /** Return the request that made the connection to the server. */
    HttpServletRequest getClientRequest();
 
    /**
@@ -47,9 +46,7 @@
     */
    HttpServletResponse getClientResponse();
 
-   /**
-    * Return the parameter map decoded form the query string.
-    */
+   /** Return the parameter map decoded form the query string. */
    Map getQueryParameterMap();
 
    /**
@@ -58,9 +55,7 @@
     */
    Map getBodyParameterMap();
 
-   /**
-    * Return the normalized media type of the request or null if none has been provided by the client.
-    */
+   /** Return the normalized media type of the request or null if none has been provided by the client. */
    String getMediaType();
 
    /**
@@ -68,23 +63,16 @@
     */
    // Charset getCharset();
 
-   /**
-    * Return the url context of this request.
-    */
+   /** Return the url context of this request. */
    URLContext getURLContext();
 
-   /**
-    * Return the value of the portal request path for this request.
-    */
+   /** Return the value of the portal request path for this request. */
    String getPortalRequestPath();
 
-   /**
-    * Return the value of the portal context path for this request.
-    */
+   /** Return the value of the portal context path for this request. */
    String getPortalContextPath();
 
    /**
-    *
     * @param url
     * @param context
     * @param format

Modified: trunk/server/src/main/org/jboss/portal/server/ServerInvocationContextFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerInvocationContextFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerInvocationContextFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/server/src/main/org/jboss/portal/server/ServerRequest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerRequest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerRequest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import java.util.Locale;
@@ -63,12 +64,12 @@
       this.server = server;
    }
 
-    /**
-     * Return the first locale in the locale list or null if the list is empty.
-     *
-     * @return the first locale in the list
-     * @throws IllegalArgumentException if the locales field is null
-     */
+   /**
+    * Return the first locale in the locale list or null if the list is empty.
+    *
+    * @return the first locale in the list
+    * @throws IllegalArgumentException if the locales field is null
+    */
    public Locale getLocale() throws IllegalStateException
    {
       if (locales == null)
@@ -83,9 +84,9 @@
    }
 
    /**
-    * Return the locales for the scope of the current request.
-    * It can be based on the locale decided by the web browser available in the original HTTP request or
-    * can be based on the current authenticated user that has decided a specific locale.
+    * Return the locales for the scope of the current request. It can be based on the locale decided by the web browser
+    * available in the original HTTP request or can be based on the current authenticated user that has decided a
+    * specific locale.
     *
     * @return the request locale
     */

Modified: trunk/server/src/main/org/jboss/portal/server/ServerResponse.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import org.jboss.portal.server.request.URLContext;

Modified: trunk/server/src/main/org/jboss/portal/server/ServerURL.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/ServerURL.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/ServerURL.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server;
 
 import java.util.Iterator;

Modified: trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/aspects/server/ContentTypeInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.aspects.server;
 
 import org.jboss.portal.common.MediaType;
@@ -34,10 +35,9 @@
 import java.io.UnsupportedEncodingException;
 
 /**
- * This interceptor set the charset on the request that is used to decode the request parameters
- * as well as setting the <code>org.jboss.portal.server.util.HTTPStreamInfo</code> on the server
- * response that can be used later by the rendering process to create the response sent to the
- * user.
+ * This interceptor set the charset on the request that is used to decode the request parameters as well as setting the
+ * <code>org.jboss.portal.server.util.HTTPStreamInfo</code> on the server response that can be used later by the
+ * rendering process to create the response sent to the user.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/aspects/server/LocaleInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.aspects.server;
 
 import org.jboss.portal.common.invocation.InvocationException;
@@ -30,9 +31,9 @@
 import java.util.Locale;
 
 /**
- * The goal of this interceptor is to choose the locale for the user. This implementation is very simple
- * as it reuses the locale specified in the incominh HTTP request.
- * 
+ * The goal of this interceptor is to choose the locale for the user. This implementation is very simple as it reuses
+ * the locale specified in the incominh HTTP request.
+ *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/aspects/server/NavigationInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.aspects.server;
 
 /**

Modified: trunk/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/aspects/server/SessionInvalidatorInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.aspects.server;
 
 import org.apache.log4j.Logger;
@@ -41,10 +42,9 @@
 import java.util.Set;
 
 /**
- * This interceptor implementation is used to keep track of all webapp the current user has
- * used during its portal session. When the invocation is tagged for a signout then it performs
- * an additional task of invalidating the sessions of the webapp that have been collected
- * during the portal session as well as invalidating the current portal session.
+ * This interceptor implementation is used to keep track of all webapp the current user has used during its portal
+ * session. When the invocation is tagged for a signout then it performs an additional task of invalidating the sessions
+ * of the webapp that have been collected during the portal session as well as invalidating the current portal session.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -52,24 +52,16 @@
 public class SessionInvalidatorInterceptor extends ServerInterceptor
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static final InvalidationCommand invalidator = new InvalidationCommand();
 
-   /**
-    * .
-    */
+   /** . */
    private static final Logger log = Logger.getLogger(SessionInvalidatorInterceptor.class);
 
-   /**
-    * .
-    */
+   /** . */
    private static final String KEY = "org.jboss.portal.session.contexts";
 
-   /**
-    * .
-    */
+   /** . */
    private static final ThreadLocal localContexts = new ThreadLocal()
    {
       protected Object initialValue()
@@ -152,14 +144,10 @@
    public static class DispatcherImpl implements CommandServlet.Dispatcher
    {
 
-      /**
-       * .
-       */
+      /** . */
       private final HttpServletRequest req;
 
-      /**
-       * .
-       */
+      /** . */
       private final HttpServletResponse resp;
 
       public DispatcherImpl(ServerInvocation invocation)

Modified: trunk/server/src/main/org/jboss/portal/server/config/ServerConfig.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/config/ServerConfig.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/config/ServerConfig.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.config;
 
 /**
@@ -50,7 +51,7 @@
    /**
     * Set a property when the value is not null or remove it when it is null.
     *
-    * @param name the property name
+    * @param name  the property name
     * @param value the property value
     */
    void setProperty(String name, String value);

Modified: trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/config/ServerConfigService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.config;
 
+import org.jboss.portal.common.util.CLLoader;
 import org.jboss.portal.common.util.LoaderResource;
-import org.jboss.portal.common.util.CLLoader;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.TreeMap;
-import java.util.Iterator;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -79,7 +79,7 @@
       {
          throw new IllegalArgumentException("No null name accepted");
       }
-      synchronized(this)
+      synchronized (this)
       {
          Map copy = new HashMap(properties);
          if (value != null)

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/CannotCreatePortletWebAppException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
 /**

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebApp.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
 import org.apache.log4j.Logger;
@@ -34,7 +35,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedOutputStream;
 import java.io.OutputStream;
 import java.net.URL;
 

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebAppFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
 import org.apache.log4j.Logger;
@@ -75,9 +76,7 @@
       }
    }
 
-   /**
-    * Recognize the jbossweb container and returns its version.
-    */
+   /** Recognize the jbossweb container and returns its version. */
    private static int getVersion()
    {
       try

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat4App.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
+import org.jboss.portal.server.servlet.CommandServlet;
+import org.jboss.web.WebApplication;
+
+import javax.servlet.ServletContext;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
 
-import javax.servlet.ServletContext;
-
-import org.jboss.portal.server.servlet.CommandServlet;
-import org.jboss.web.WebApplication;
-
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -113,8 +113,8 @@
             Method addChildMethod = containerBaseClass.getMethod("addChild", new Class[]{containerItf});
             addChildMethod.invoke(standardContext, new Object[]{wrapper});
 
-            Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class,String.class});
-            addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet","CommandServlet"});
+            Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class, String.class});
+            addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet", "CommandServlet"});
 
             Method loadOnStartupMethod = standardContextClass.getMethod("loadOnStartup", new Class[]{wrapperArray.getClass()});
             loadOnStartupMethod.invoke(standardContext, new Object[]{wrapperArray});

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/PortalWebTomcat5App.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,37 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
+import org.jboss.portal.server.servlet.CommandFilter;
+import org.jboss.portal.server.servlet.CommandServlet;
+import org.jboss.web.WebApplication;
+
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 import javax.servlet.ServletContext;
-
-import org.jboss.web.WebApplication;
-import org.jboss.portal.server.servlet.CommandServlet;
-import org.jboss.portal.server.servlet.CommandFilter;
-
-import java.lang.reflect.Method;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.net.URL;
 
 /**
@@ -215,8 +215,8 @@
       Method addChildMethod = containerBaseClass.getMethod("addChild", new Class[]{containerItf});
       addChildMethod.invoke(standardContext, new Object[]{wrapper});
 
-      Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class,String.class});
-      addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet","CommandServlet"});
+      Method addServletMapping = contextItf.getMethod("addServletMapping", new Class[]{String.class, String.class});
+      addServletMapping.invoke(standardContext, new Object[]{"/jbossportlet", "CommandServlet"});
 
       Method loadOnStartupMethod = standardContextClass.getMethod("loadOnStartup", new Class[]{wrapperArray.getClass()});
       loadOnStartupMethod.invoke(standardContext, new Object[]{wrapperArray});

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
+import org.jboss.deployment.DeploymentException;
 import org.jboss.portal.server.deployment.jboss.ServerDeployerMBean;
 import org.jboss.portal.test.framework.deployment.MainDeployerFacade;
-import org.jboss.deployment.DeploymentException;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/WebAppEnhancer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,40 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import org.jboss.mx.util.MBeanProxy;
 import org.jboss.portal.common.util.XML;
 import org.jboss.portal.server.config.ServerConfig;
-import org.jboss.mx.util.MBeanProxy;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
 import javax.management.ObjectName;
 import java.util.Iterator;
 
 /**
+ * The role of this object is to modify the web application so it is possible to invoke it by request distpatching.
  *
- * The role of this object is to modify the web application so it is possible
- * to invoke it by request distpatching.
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -84,7 +83,7 @@
                //
                if (serviceRef.startsWith(":"))
                {
-                  log.debug("Detecting a relative service reference " + serviceRef + " prepending it with " + config.getDomain() );
+                  log.debug("Detecting a relative service reference " + serviceRef + " prepending it with " + config.getDomain());
                   serviceRef = config.getDomain() + serviceRef;
                }
 

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/WebAppIntercepter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment;
 
 import org.jboss.deployment.DeploymentInfo;

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/AbstractDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
 import org.jboss.portal.common.util.Tools;
@@ -48,9 +49,7 @@
    /** The short name. */
    protected final String name;
 
-   /**
-    * The default constructor initialize the service with the registration controlled by the service.
-    */
+   /** The default constructor initialize the service with the registration controlled by the service. */
    protected AbstractDeploymentFactory()
    {
       super();
@@ -65,9 +64,7 @@
       return name;
    }
 
-   /**
-    * Accept only the WEB-INF directory by default.
-    */
+   /** Accept only the WEB-INF directory by default. */
    public boolean acceptDir(URL url)
    {
       return url.getPath().endsWith("/WEB-INF/");
@@ -104,8 +101,8 @@
    }
 
    /**
-    * Register the factory against the server deployer and kick off the deployment of the urls
-    * that this factory can deploy.
+    * Register the factory against the server deployer and kick off the deployment of the urls that this factory can
+    * deploy.
     */
    public void registerFactory()
    {
@@ -113,8 +110,8 @@
    }
 
    /**
-    * Unregister the factory against the server deployer and shutdown the deployment of the urls
-    * that this factory can deploy.
+    * Unregister the factory against the server deployer and shutdown the deployment of the urls that this factory can
+    * deploy.
     */
    public void unregisterFactory()
    {
@@ -127,8 +124,8 @@
    }
 
    /**
-    * Set the setup url with the resource obtained from the thread context class loader using the
-    * value of setup location if this one is not null.
+    * Set the setup url with the resource obtained from the thread context class loader using the value of setup
+    * location if this one is not null.
     */
    protected void createService() throws Exception
    {
@@ -138,9 +135,7 @@
       }
    }
 
-   /**
-    * Register the factory only if it is controlled by the service lifecycle.
-    */
+   /** Register the factory only if it is controlled by the service lifecycle. */
    public void startService() throws Exception
    {
       if (registrationControlledByService)
@@ -149,9 +144,7 @@
       }
    }
 
-   /**
-    * Unregister the factory only if it is controlled by the service lifecycle.
-    */
+   /** Unregister the factory only if it is controlled by the service lifecycle. */
    public void stopService()
    {
       if (registrationControlledByService)
@@ -160,9 +153,7 @@
       }
    }
 
-   /**
-    * Set to null the setup url.
-    */
+   /** Set to null the setup url. */
    protected void destroyService() throws Exception
    {
       setupURL = null;

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/Deployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;
+import org.jboss.logging.Logger;
+import org.jboss.mx.loading.RepositoryClassLoader;
 import org.jboss.portal.server.deployment.PortalWebApp;
-import org.jboss.mx.loading.RepositoryClassLoader;
-import org.jboss.logging.Logger;
 
 import javax.management.MBeanServer;
+import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.MalformedURLException;
-import java.io.File;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -38,22 +39,22 @@
 public class Deployment
 {
 
-   /** The logger.*/
+   /** The logger. */
    protected final Logger log = Logger.getLogger(getClass());
 
    /** The deployment URL. */
    protected final URL url;
 
-   /** The web app abstraction.*/
+   /** The web app abstraction. */
    protected final PortalWebApp pwa;
 
-   /** The JMX server.*/
+   /** The JMX server. */
    protected final MBeanServer mbeanServer;
 
    /**
     * Create a deployment that is not nested within a web application archive.
     *
-    * @param url the deployment URL
+    * @param url         the deployment URL
     * @param mbeanServer the JMX mbean server
     */
    public Deployment(URL url, MBeanServer mbeanServer)
@@ -66,8 +67,8 @@
    /**
     * Create a deployment nested within a web application archive
     *
-    * @param url the deployment URL
-    * @param pwa the web application
+    * @param url         the deployment URL
+    * @param pwa         the web application
     * @param mbeanServer the JMX mbean server
     */
    public Deployment(URL url, PortalWebApp pwa, MBeanServer mbeanServer)
@@ -77,17 +78,23 @@
       this.mbeanServer = mbeanServer;
    }
 
-   public void create() throws DeploymentException { }
+   public void create() throws DeploymentException
+   {
+   }
 
-   public void start() throws DeploymentException { }
+   public void start() throws DeploymentException
+   {
+   }
 
-   public void stop() throws DeploymentException { }
+   public void stop() throws DeploymentException
+   {
+   }
 
-   public void destroy() throws DeploymentException { }
+   public void destroy() throws DeploymentException
+   {
+   }
 
-   /**
-    * Find the URL of the WEB-INF directory in the war file.
-    */
+   /** Find the URL of the WEB-INF directory in the war file. */
    public static URL findWEBINFURL(URL warURL) throws DeploymentException
    {
       try
@@ -109,9 +116,7 @@
       }
    }
 
-   /**
-    * Find the repository classloader reltated to the argument classloader.
-    */
+   /** Find the repository classloader reltated to the argument classloader. */
    public static RepositoryClassLoader findRepositoryClassLoader(ClassLoader loader) throws DeploymentException
    {
       while (loader != null)

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/DeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;
@@ -38,21 +39,17 @@
 
    String getName();
 
-   /**
-    * Return true if the factory accept to create a deployment for this url. 
-    */
+   /** Return true if the factory accept to create a deployment for this url. */
    boolean accept(URL url);
 
-   /**
-    * Return true if the directory should be visited.
-    */
+   /** Return true if the directory should be visited. */
    boolean acceptDir(URL url);
 
    /**
     * Create a new instance of the deployment.
     *
-    * @param url the URL of the file to deploy
-    * @param pwa the web application that contains the file to deploy
+    * @param url         the URL of the file to deploy
+    * @param pwa         the web application that contains the file to deploy
     * @param mbeanServer the JMX mbean server
     * @return a deployment
     * @throws DeploymentException if the deployment cannot be created
@@ -60,8 +57,8 @@
    Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer) throws DeploymentException;
 
    /**
-    * Returns an URL that must be processed just after this has been registered. If the method
-    * returns null then no processing is done. This method should always return the same value.
+    * Returns an URL that must be processed just after this has been registered. If the method returns null then no
+    * processing is done. This method should always return the same value.
     */
    URL getSetupURL();
 }

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;
@@ -63,7 +64,7 @@
    public boolean accepts(DeploymentInfo di)
    {
       String urlStr = di.url.toString();
-      for (int i = 0;i < acceptedSuffixes.length;i++)
+      for (int i = 0; i < acceptedSuffixes.length; i++)
       {
          String suffix = acceptedSuffixes[i];
          if (urlStr.endsWith(suffix))

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/GenericDeployerMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
 import org.jboss.deployment.SubDeployerMBean;
@@ -31,7 +32,10 @@
    extends SubDeployerMBean
 {
    String[] getAcceptedSuffixes();
+
    void setAcceptedSuffixes(String[] acceptedSuffixes);
+
    ServerDeployerMBean getServerDeployer();
+
    void setServerDeployer(ServerDeployerMBean serverDeployer);
 }

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/PortalDeploymentInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,42 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
+import org.apache.log4j.Logger;
+import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentException;
-import org.jboss.portal.server.deployment.PortalWebApp;
+import org.jboss.portal.common.net.URLNavigator;
+import org.jboss.portal.common.net.URLVisitor;
 import org.jboss.portal.common.util.SetMap;
 import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.common.net.URLNavigator;
-import org.jboss.portal.common.net.URLVisitor;
-import org.apache.log4j.Logger;
+import org.jboss.portal.server.deployment.PortalWebApp;
 
 import javax.management.MBeanServer;
+import java.io.IOException;
 import java.net.URL;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.Set;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -102,10 +103,12 @@
          }
          blah.addLast(Boolean.valueOf(accepted));
       }
+
       public void endDir(URL url, String name)
       {
          blah.removeLast();
       }
+
       public void file(URL url, String name)
       {
          Boolean accepted = Boolean.TRUE;
@@ -140,7 +143,7 @@
       for (Iterator i = visitor.ctxs.iterator(); i.hasNext();)
       {
          DeploymentContext ctx = (DeploymentContext)i.next();
-         deployements.put(ctx.url,  ctx);
+         deployements.put(ctx.url, ctx);
       }
       return visitor.ctxs;
    }
@@ -183,7 +186,7 @@
          if (factory == null)
          {
             throw new IllegalArgumentException();
-         }                        
+         }
          this.factory = factory;
          this.url = url;
       }

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
 import org.apache.log4j.Logger;

Modified: trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployerMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.deployment.jboss;
 
-import org.jboss.deployment.SubDeployerMBean;
 import org.jboss.deployment.DeploymentException;
+import org.jboss.deployment.SubDeployerMBean;
 import org.jboss.portal.server.Server;
 import org.jboss.portal.server.deployment.PortalWebApp;
-import org.w3c.dom.Element;
 
 import java.net.URL;
 import java.util.Set;
@@ -69,9 +69,7 @@
    void unregisterFactory(DeploymentFactory factory);
 
 
-   /**
-    * Locate a deployment info factory based on the url. If no factory is found it returns null.
-    */
+   /** Locate a deployment info factory based on the url. If no factory is found it returns null. */
    DeploymentFactory findFactory(URL url);
 
 }

Modified: trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/AbstractSessionAttributeResolver.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import org.jboss.portal.common.invocation.AttributeResolver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -108,7 +109,7 @@
       {
          String mapKey = getMapKey();
          Map map = (Map)session.getAttribute(mapKey);
-         if (map ==  null)
+         if (map == null)
          {
             map = createMap(mapKey);
             session.setAttribute(mapKey, map);

Modified: trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/MapAttributeResolver.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import org.jboss.portal.common.invocation.AttributeResolver;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/PrincipalAttributeResolver.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/RequestAttributeResolver.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import org.jboss.portal.common.invocation.AttributeResolver;

Modified: trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/ServerImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import org.jboss.portal.common.util.Version;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.server.PortalConstants;
 import org.jboss.portal.server.Server;
-import org.jboss.portal.server.PortalConstants;
 import org.jboss.portal.server.config.ServerConfig;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 /**
  * Should bootstrap the microcontainer in the (near) future.

Modified: trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/ServerInvocationContextImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import org.jboss.portal.common.invocation.AbstractInvocationContext;
+import org.jboss.portal.server.PortalConstants;
 import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.server.ServerInvocationContext;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.server.PortalConstants;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
 import org.jboss.portal.server.servlet.PortalServlet;

Modified: trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/SessionAttributeResolver.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl;
 
 import javax.servlet.http.HttpServletRequest;

Modified: trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl.invocation;
 
 import org.jboss.portal.common.invocation.Interceptor;
@@ -32,9 +33,7 @@
  */
 public abstract class JBossInterceptor extends AbstractJBossService implements Interceptor
 {
-   /**
-    * Return the implemented interceptor.
-    */
+   /** Return the implemented interceptor. */
    public Interceptor getInterceptor()
    {
       return this;

Modified: trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStack.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl.invocation;
 
+import org.jboss.portal.common.invocation.Interceptor;
 import org.jboss.portal.common.invocation.InterceptorStack;
-import org.jboss.portal.common.invocation.Interceptor;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */

Modified: trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStackFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStackFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/impl/invocation/JBossInterceptorStackFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.impl.invocation;
 
 import org.jboss.portal.common.invocation.Interceptor;
-import org.jboss.portal.common.invocation.InterceptorStackFactory;
 import org.jboss.portal.common.invocation.InterceptorStack;
+import org.jboss.portal.common.invocation.InterceptorStackFactory;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 import javax.management.ObjectName;
 import java.util.List;
 
 /**
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision: 1.10 $
  */
@@ -84,9 +84,7 @@
       rebuild();
    }
 
-   /**
-    * Rebuild the interceptor stack.
-    */
+   /** Rebuild the interceptor stack. */
    public void rebuild() throws Exception
    {
       if (interceptorNames != null)

Modified: trunk/server/src/main/org/jboss/portal/server/request/URLContext.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/request/URLContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/request/URLContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.request;
 
 /**

Modified: trunk/server/src/main/org/jboss/portal/server/request/URLFormat.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/request/URLFormat.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/request/URLFormat.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.request;
 
 /**

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingRequest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,38 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpSession;
-import javax.servlet.ServletInputStream;
-import javax.servlet.RequestDispatcher;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
 import java.util.Enumeration;
+import java.util.Locale;
 import java.util.Map;
-import java.util.Locale;
-import java.security.Principal;
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-import java.io.BufferedReader;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/AbstractDelegatingResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.ServletOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Locale;

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/CommandFilter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
 import org.apache.log4j.Logger;
 
 import javax.servlet.Filter;
+import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.servlet.FilterChain;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -57,12 +58,12 @@
          {
             req.removeAttribute(FilterCommand.REQ_ATT_KEY);
             Method methods = cmd.getClass().getMethod(
-                  "execute",
-                  new Class[]{
-                     HttpServletRequest.class,
-                     HttpServletResponse.class,
-                     FilterChain.class});
-            methods.invoke(cmd, new Object[]{req,resp,chain});
+               "execute",
+               new Class[]{
+                  HttpServletRequest.class,
+                  HttpServletResponse.class,
+                  FilterChain.class});
+            methods.invoke(cmd, new Object[]{req, resp, chain});
          }
          catch (NoSuchMethodException e)
          {
@@ -82,22 +83,22 @@
                {
                   se.initCause(se.getRootCause());
                }
-               throw (ServletException)wrappee;
+               throw(ServletException)wrappee;
             }
             // Rethrow the checked IOException
             if (wrappee instanceof IOException)
             {
-               throw (IOException)wrappee;
+               throw(IOException)wrappee;
             }
             // Rethrow RuntimeException
             if (wrappee instanceof RuntimeException)
             {
-               throw (RuntimeException)wrappee;
+               throw(RuntimeException)wrappee;
             }
             // Rethrow Error
             if (wrappee instanceof Error)
             {
-               throw (Error)wrappee;
+               throw(Error)wrappee;
             }
             // Here we wrap it and rethrow
             ServletException se = new ServletException("The invoked command threw an exception", wrappee);

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/CommandServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,46 +1,44 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import org.apache.log4j.Logger;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
-import org.apache.log4j.Logger;
-
 /**
- * This servlet is used to execute command coming from another
- * context through a dispatching request.
+ * This servlet is used to execute command coming from another context through a dispatching request.
+ * <p/>
+ * The command invocation is detyped to allow it working on redeploy and avoid class cast exception.
  *
- * The command invocation is detyped to allow it working on redeploy
- * and avoid class cast exception.
- *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
  */
@@ -54,21 +52,18 @@
 
    private static final ThreadLocal localCmd = new ThreadLocal();
 
-   /**
-    * Provide an spi for dispatching to a request dispatcher.
-    */
+   /** Provide an spi for dispatching to a request dispatcher. */
    public interface Dispatcher
    {
       void include(RequestDispatcher rd) throws IOException, ServletException;
    }
 
    /**
-    * Execute a command after having performed a request dispatch in the target
-    * servlet context.
+    * Execute a command after having performed a request dispatch in the target servlet context.
     *
     * @param dispatcher the dispatcher that will provide the request and response.
-    * @param cmd the command to execute after the inclusion is done
-    * @param ctx the target servlet context
+    * @param cmd        the command to execute after the inclusion is done
+    * @param ctx        the target servlet context
     * @throws IOException
     * @throws ServletException
     */
@@ -97,11 +92,11 @@
          try
          {
             Method methods = cmd.getClass().getMethod(
-                  "execute",
-                  new Class[]{
-                     HttpServletRequest.class,
-                     HttpServletResponse.class});
-            methods.invoke(cmd, new Object[]{req,resp});
+               "execute",
+               new Class[]{
+                  HttpServletRequest.class,
+                  HttpServletResponse.class});
+            methods.invoke(cmd, new Object[]{req, resp});
          }
          catch (NoSuchMethodException e)
          {
@@ -121,22 +116,22 @@
                {
                   se.initCause(se.getRootCause());
                }
-               throw (ServletException)wrappee;
+               throw(ServletException)wrappee;
             }
             // Rethrow the checked IOException
             if (wrappee instanceof IOException)
             {
-               throw (IOException)wrappee;
+               throw(IOException)wrappee;
             }
             // Rethrow RuntimeException
             if (wrappee instanceof RuntimeException)
             {
-               throw (RuntimeException)wrappee;
+               throw(RuntimeException)wrappee;
             }
             // Rethrow Error
             if (wrappee instanceof Error)
             {
-               throw (Error)wrappee;
+               throw(Error)wrappee;
             }
             // Here we wrap it and rethrow
             ServletException se = new ServletException("The invoked command threw an exception", wrappee);

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/FilterCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletException;
-import javax.servlet.FilterChain;
 import java.io.IOException;
 
 /**
@@ -36,5 +37,6 @@
 public interface FilterCommand
 {
    String REQ_ATT_KEY = "org.jboss.portal.portlet.servlet.FilterCommand";
+
    void execute(HttpServletRequest req, HttpServletResponse resp, FilterChain chain) throws ServletException, IOException;
 }

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/PathMapping.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/PathMapping.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/PathMapping.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
 /**
@@ -27,13 +28,9 @@
  */
 public interface PathMapping
 {
-   /**
-    * Return the object graph root.
-    */
+   /** Return the object graph root. */
    Object getRoot();
 
-   /**
-    * Return the child object having the specified name or null if it does not exists.
-    */
+   /** Return the child object having the specified name or null if it does not exists. */
    Object getChild(Object parent, String name);
 }

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/PathMappingResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
 /**
@@ -59,8 +60,8 @@
    public int hashCode()
    {
       int hashCode = (target != null ? target.hashCode() : 0) +
-                     (matchedPath != null ? matchedPath.hashCode() : 0) +
-                     (remainingPath != null ? remainingPath.hashCode() : 0);
+         (matchedPath != null ? matchedPath.hashCode() : 0) +
+         (remainingPath != null ? remainingPath.hashCode() : 0);
       return hashCode;
    }
 
@@ -74,8 +75,8 @@
       {
          PathMappingResult other = (PathMappingResult)obj;
          return (target == null ? (other.target == null) : target.equals(other.target)) &&
-                (matchedPath == null ? (other.matchedPath == null) : matchedPath.equals(other.matchedPath)) &&
-                (remainingPath == null ? (other.remainingPath == null) : remainingPath.equals(other.remainingPath));
+            (matchedPath == null ? (other.matchedPath == null) : matchedPath.equals(other.matchedPath)) &&
+            (remainingPath == null ? (other.remainingPath == null) : remainingPath.equals(other.remainingPath));
       }
       return false;
    }

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/PathParser.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/PathParser.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/PathParser.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
 /**

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/PortalServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
 import org.apache.log4j.Logger;
@@ -29,6 +30,8 @@
 import org.jboss.portal.common.util.Exceptions;
 import org.jboss.portal.common.util.URLTools;
 import org.jboss.portal.server.PortalConstants;
+import org.jboss.portal.server.RequestController;
+import org.jboss.portal.server.RequestControllerDispatcher;
 import org.jboss.portal.server.Server;
 import org.jboss.portal.server.ServerException;
 import org.jboss.portal.server.ServerInvocation;
@@ -36,8 +39,6 @@
 import org.jboss.portal.server.ServerRequest;
 import org.jboss.portal.server.ServerResponse;
 import org.jboss.portal.server.ServerURL;
-import org.jboss.portal.server.RequestControllerDispatcher;
-import org.jboss.portal.server.RequestController;
 import org.jboss.portal.server.impl.ServerInvocationContextImpl;
 import org.jboss.portal.server.request.URLContext;
 import org.jboss.portal.server.request.URLFormat;
@@ -275,7 +276,7 @@
       portalContextPath = URLTools.decodeXWWWFormURL(portalContextPath);
 
       //
-      URLContext urlContext= parseURLContext(req);
+      URLContext urlContext = parseURLContext(req);
 
       // ***************
       // ***************
@@ -565,9 +566,7 @@
       return URLContext.newInstance(req.isSecure(), req.getRemoteUser() != null);
    }
 
-   /**
-    * Parse the query string and build an unmodifiable parameter map of it.
-    */
+   /** Parse the query string and build an unmodifiable parameter map of it. */
    private Map parseQueryString(String queryString)
    {
       Map result = Collections.EMPTY_MAP;

Modified: trunk/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/servlet/ServletCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.servlet;
 
-import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
  * Command to be executed in the command servlet.

Modified: trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/server/util/HTTPStreamInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.server.util;
 
 import org.jboss.portal.common.MediaType;

Modified: trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/AbstractTestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,36 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test;
 
-import java.io.File;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
 import junit.framework.TestCase;
-
 import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.File;
+
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$

Modified: trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/PortalTestSetup.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 /*
  * JBoss, the OpenSource J2EE webOS
  *
@@ -15,8 +38,7 @@
 import java.net.URL;
 
 /**
- * Deals with deployment and undeployment of archives
- * to the JBoss server
+ * Deals with deployment and undeployment of archives to the JBoss server
  *
  * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
  * @since Feb 1, 2006
@@ -25,9 +47,7 @@
 {
    private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer";
 
-   /**
-    * Deploy the given archive
-    */
+   /** Deploy the given archive */
    public void deploy(String archive) throws Exception
    {
       MBeanServerConnection server = getServer();
@@ -37,9 +57,7 @@
          new Object[]{url}, new String[]{"java.net.URL"});
    }
 
-   /**
-    * Undeploy the given archive
-    */
+   /** Undeploy the given archive */
    public void undeploy(String archive) throws Exception
    {
       MBeanServerConnection server = getServer();
@@ -49,9 +67,7 @@
          new Object[]{url}, new String[]{"java.net.URL"});
    }
 
-   /**
-    * Get the MBeanServerConnection from JNDI
-    */
+   /** Get the MBeanServerConnection from JNDI */
    public MBeanServerConnection getServer() throws NamingException
    {
       InitialContext ctx = new InitialContext();
@@ -59,9 +75,7 @@
       return server;
    }
 
-   /**
-    * Try to discover the URL for the deployment archive
-    */
+   /** Try to discover the URL for the deployment archive */
    private URL getArchiveURL(String archive) throws MalformedURLException
    {
       URL url = null;
@@ -111,7 +125,6 @@
       }*/
 
 
-
       if (url == null)
       {
          throw new IllegalArgumentException("Cannot obtain URL for: " + archive);

Modified: trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/AbstractTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server;
 
-import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.server.ServerInvocation;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.test.framework.container.result.Result;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -84,9 +85,7 @@
     */
    public abstract Result execute(ServerInvocation invocation);
 
-   /**
-    * Get the test id from the class name. It can be overriden.
-    */
+   /** Get the test id from the class name. It can be overriden. */
    protected String createCaseTestId(Class clazz)
    {
       String s = clazz.getName();

Modified: trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server;
 
 import org.jboss.portal.server.RequestController;
@@ -30,5 +31,6 @@
 public interface RequestControllerTest extends RequestController
 {
    void add(AbstractTest test);
+
    void remove(AbstractTest test);
 }

Modified: trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/RequestControllerTestImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server;
 
+import org.jboss.portal.jems.as.system.AbstractJBossService;
+import org.jboss.portal.server.ServerException;
 import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.server.ServerException;
 import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/CharsetTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/GetTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import org.jboss.portal.server.AbstractServerURL;

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataNoCharsetTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import org.jboss.portal.server.AbstractServerURL;

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostMultipartFormDataUTF8Test.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import org.jboss.portal.server.AbstractServerURL;

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import org.jboss.portal.server.AbstractServerURL;

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedNoCharsetTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import org.jboss.portal.server.AbstractServerURL;

Modified: trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/charset/PostXWWWFormURLEncodedUTF8Test.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.charset;
 
 import org.jboss.portal.server.AbstractServerURL;

Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/GetTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.parameters;
 
 import org.jboss.portal.server.AbstractServerURL;
@@ -46,7 +47,7 @@
          AbstractServerURL url = new AbstractServerURL();
          url.setPortalRequestPath("/index.html");
          url.setParameterValue("a", "b");
-         url.setParameterValues("c", new String[]{"d","e"});
+         url.setParameterValues("c", new String[]{"d", "e"});
          url.setParameterValues("encoding", new String[]{Utils.RANGE_0_255});
          String s = invocation.getResponse().encodeURL(url);
          return new InvokeGetResult(s);
@@ -73,7 +74,7 @@
                //
                String[] c = (String[])queryParameterMap.get("c");
                assertNotNull(c);
-               assertEquals(new String[]{"d","e"}, c);
+               assertEquals(new String[]{"d", "e"}, c);
 
                //
                String[] f = (String[])queryParameterMap.get("encoding");

Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/ParametersTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.parameters;
 
+import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
-import junit.framework.Test;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.parameters;
 
 import org.jboss.portal.server.AbstractServerURL;
@@ -48,13 +49,13 @@
 
          //
          url.setParameterValue("a", "b");
-         url.setParameterValues("c", new String[]{"d","e"});
+         url.setParameterValues("c", new String[]{"d", "e"});
 
          //
          url.setParameterValues("f", new String[]{"g"});
          body.addParameter("f", new String[]{"_g"});
-         url.setParameterValues("h", new String[]{"i","j"});
-         body.addParameter("h", new String[]{"_i","_j"});
+         url.setParameterValues("h", new String[]{"i", "j"});
+         body.addParameter("h", new String[]{"_i", "_j"});
          url.setParameterValues("encoding_1", new String[]{Utils.RANGE_0_255});
          body.addParameter("encoding_1", new String[]{Utils.RANGE_0_255});
          url.setParameterValues("encoding_2", new String[]{Utils.RANGE_256_512});
@@ -62,7 +63,7 @@
 
          //
          body.addParameter("k", new String[]{"l"});
-         body.addParameter("m", new String[]{"n","o"});
+         body.addParameter("m", new String[]{"n", "o"});
 
          //
          String s = invocation.getResponse().encodeURL(url);
@@ -99,7 +100,7 @@
                String[] bc = (String[])bodyParameterMap.get("c");
                assertNotNull(qc);
                assertNull(bc);
-               assertEquals(new String[]{"d","e"}, qc);
+               assertEquals(new String[]{"d", "e"}, qc);
 
                //
                String[] qf = (String[])queryParameterMap.get("f");
@@ -114,8 +115,8 @@
                String[] bh = (String[])bodyParameterMap.get("h");
                assertNotNull(qh);
                assertNotNull(bh);
-               assertEquals(new String[]{"i","j"}, qh);
-               assertEquals(new String[]{"_i","_j"}, bh);
+               assertEquals(new String[]{"i", "j"}, qh);
+               assertEquals(new String[]{"_i", "_j"}, bh);
 
                //
                String[] qencoding1 = (String[])queryParameterMap.get("encoding_1");
@@ -145,7 +146,7 @@
                String[] bm = (String[])bodyParameterMap.get("m");
                assertNull(qm);
                assertNotNull(bm);
-               assertEquals(new String[]{"n","o"}, bm);
+               assertEquals(new String[]{"n", "o"}, bm);
             }
          });
          return assertResult;

Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.parameters;
 
 import org.jboss.portal.server.AbstractServerURL;
@@ -48,13 +49,13 @@
 
          //
          url.setParameterValue("a", "b");
-         url.setParameterValues("c", new String[]{"d","e"});
+         url.setParameterValues("c", new String[]{"d", "e"});
 
          //
          url.setParameterValues("f", new String[]{"g"});
          body.addParameter("f", new String[]{"_g"});
-         url.setParameterValues("h", new String[]{"i","j"});
-         body.addParameter("h", new String[]{"_i","_j"});
+         url.setParameterValues("h", new String[]{"i", "j"});
+         body.addParameter("h", new String[]{"_i", "_j"});
 
          String s = invocation.getResponse().encodeURL(url);
          InvokePostResult result = new InvokePostResult();
@@ -85,7 +86,7 @@
                //
                String[] c = (String[])queryParameterMap.get("c");
                assertNotNull(c);
-               assertEquals(new String[]{"d","e"}, c);
+               assertEquals(new String[]{"d", "e"}, c);
             }
          });
          return assertResult;

Modified: trunk/server/src/main/org/jboss/portal/test/server/parameters/Utils.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/parameters/Utils.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/parameters/Utils.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.parameters;
 
 /**
@@ -35,7 +36,7 @@
    private static String computeFrom0To255()
    {
       StringBuffer tmp = new StringBuffer();
-      for (int i = 0;i < 256;i++)
+      for (int i = 0; i < 256; i++)
       {
          char c = (char)i;
          tmp.append(c);
@@ -46,7 +47,7 @@
    private static String computeFrom256To512()
    {
       StringBuffer tmp = new StringBuffer();
-      for (int i = 256;i < 512;i++)
+      for (int i = 256; i < 512; i++)
       {
          char c = (char)i;
          tmp.append(c);
@@ -68,7 +69,7 @@
       {
          return "lengths don't match " + s1.length() + "!=" + s2.length();
       }
-      for (int i = s1.length() - 1;i >= 0;i--)
+      for (int i = s1.length() - 1; i >= 0; i--)
       {
          char c1 = s1.charAt(i);
          char c2 = s2.charAt(i);

Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/DefaultServletMappingTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.servlet;
 
 import org.jboss.portal.server.ServerInvocation;
@@ -44,7 +45,7 @@
    {
       ServerRequest req = invocation.getRequest();
       final ServerInvocationContext ctx = invocation.getServerContext();
-      switch(TestCaseContext.getCurrentRequestCount())
+      switch (TestCaseContext.getCurrentRequestCount())
       {
          case 0:
             result.execute(new AssertResult.Test()

Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/PathMappingTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.servlet;
 
 import org.jboss.portal.server.ServerInvocation;
@@ -44,7 +45,7 @@
    {
       ServerRequest req = invocation.getRequest();
       final ServerInvocationContext ctx = invocation.getServerContext();
-      switch(TestCaseContext.getCurrentRequestCount())
+      switch (TestCaseContext.getCurrentRequestCount())
       {
          case 0:
             result.execute(new AssertResult.Test()

Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/RootPathMappingTest.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.servlet;
 
 import org.jboss.portal.server.ServerInvocation;
@@ -44,7 +45,7 @@
    {
       ServerRequest req = invocation.getRequest();
       final ServerInvocationContext ctx = invocation.getServerContext();
-      switch(TestCaseContext.getCurrentRequestCount())
+      switch (TestCaseContext.getCurrentRequestCount())
       {
          case 0:
             result.execute(new AssertResult.Test()

Modified: trunk/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/main/org/jboss/portal/test/server/servlet/ServletTestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.server.servlet;
 
 import junit.framework.Test;
+import org.jboss.portal.test.framework.container.client.TestCase;
 import org.jboss.portal.test.framework.container.client.TestSuite;
-import org.jboss.portal.test.framework.container.client.TestCase;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/portal-server-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server configuration service -->

Modified: trunk/server/src/resources/portal-server-sar/conf/config.xml
===================================================================
--- trunk/server/src/resources/portal-server-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/portal-server-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
    <entry key="blah">bluh</entry>
 </properties>

Modified: trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server configuration service -->

Modified: trunk/server/src/resources/test/test-charset-sar/conf/config.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-charset-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
 </properties>

Modified: trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server configuration service -->

Modified: trunk/server/src/resources/test/test-parameters-sar/conf/config.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-parameters-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
 </properties>

Modified: trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-servlet-defaultservletmapping-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-servlet-pathmapping-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-servlet-rootpathmapping-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Server configuration service -->

Modified: trunk/server/src/resources/test/test-servlet-sar/conf/config.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-servlet-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
 </properties>

Modified: trunk/server/src/resources/test/test-session-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test/test-session-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test/test-session-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test-agent-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
    <context-root>/test</context-root>
 </jboss-web>

Modified: trunk/server/src/resources/test-agent-war/WEB-INF/web.xml
===================================================================
--- trunk/server/src/resources/test-agent-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/server/src/resources/test-agent-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
    "http://java.sun.com/dtd/web-app_2_3.dtd">

Modified: trunk/test/build.xml
===================================================================
--- trunk/test/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
    <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
@@ -31,14 +54,13 @@
    <!--| It also sets up the basic extention tasks amoung other things.     |-->
    <!--+====================================================================+-->
 
-   &buildmagic;   
+   &buildmagic;
    &modules;
    &defaults;
    &tools;
    &targets;
 
 
-
    <!-- ================================================================== -->
    <!-- Initialization                                                     -->
    <!-- ================================================================== -->
@@ -79,9 +101,6 @@
       </path>
 
 
-
-
-
       <!-- Configure modules -->
       <call target="configure-modules"/>
       <path id="dependentmodule.classpath">
@@ -196,8 +215,8 @@
    </target>
 
    <target name="undeploy"
-      description="Undeploy."
-      depends="init">
+           description="Undeploy."
+           depends="init">
       <require file="${jboss.home}/server/${portal.deploy.dir}"/>
       <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-test.sar"/>
    </target>

Modified: trunk/test/src/etc/datasources.xml
===================================================================
--- trunk/test/src/etc/datasources.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/etc/datasources.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <datasources>
    <datasource>
       <display-name>hsqldb</display-name>

Modified: trunk/test/src/etc/directories.xml
===================================================================
--- trunk/test/src/etc/directories.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/etc/directories.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <directories>
    <directory>
       <name>ApacheDS</name>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/JBossServiceLookup.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework;
 
 import org.jboss.mx.util.MBeanProxy;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/JNDIServiceLookup.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework;
 
 import javax.naming.InitialContext;
@@ -89,8 +90,19 @@
       }
    }
 
-   public void create() {}
-   public void start() {}
-   public void stop() {}
-   public void destroy() {}
+   public void create()
+   {
+   }
+
+   public void start()
+   {
+   }
+
+   public void stop()
+   {
+   }
+
+   public void destroy()
+   {
+   }
 }

Modified: trunk/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/ServiceLookup.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework;
 
 /**

Modified: trunk/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/TestBeanFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework;
 
 import java.util.Map;
@@ -42,8 +43,19 @@
       return beans.get(id);
    }
 
-   public void create() {}
-   public void start() {}
-   public void stop() {}
-   public void destroy() {}
+   public void create()
+   {
+   }
+
+   public void start()
+   {
+   }
+
+   public void stop()
+   {
+   }
+
+   public void destroy()
+   {
+   }
 }

Modified: trunk/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/TestRuntimeContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework;
 
 import org.apache.log4j.Logger;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container;
 
 import org.jboss.portal.test.framework.container.result.Result;
 import org.jboss.portal.test.framework.server.NodeId;
 
 import java.io.Serializable;
-import java.net.URL;
 import java.net.MalformedURLException;
+import java.net.URL;
 
 /**
  * The test context seen from the server side.
@@ -55,9 +56,7 @@
       return currentContext;
    }
 
-   /**
-    * Set the current context.
-    */
+   /** Set the current context. */
    public static void setCurrentContext(TestCaseContext newContext)
    {
       currentContext = newContext;
@@ -121,8 +120,7 @@
    }
 
    /**
-    *
-    * @param url the url to rewrite
+    * @param url    the url to rewrite
     * @param nodeId the node id
     * @return the rewritten url
     * @throws MalformedURLException

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/TestCaseContextAccessor.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container;
 
 /**
@@ -28,5 +29,6 @@
 public interface TestCaseContextAccessor
 {
    void setContext(TestCaseContext context);
+
    TestCaseContext getContext();
 }

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCase.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,61 +1,60 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client;
 
-import org.apache.log4j.Logger;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.HttpMethod;
+import junit.framework.AssertionFailedError;
+import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.Header;
+import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.SimpleHttpConnectionManager;
-import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.auth.AuthScope;
+import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.params.HttpMethodParams;
-import org.jboss.portal.test.framework.container.client.command.RethrowCommand;
-import org.jboss.portal.test.framework.container.client.command.DoGetCommand;
-import org.jboss.portal.test.framework.container.client.command.EndCommand;
+import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.container.client.command.ClientCommand;
+import org.jboss.portal.test.framework.container.client.command.DoGetCommand;
 import org.jboss.portal.test.framework.container.client.command.DoPostCommand;
+import org.jboss.portal.test.framework.container.client.command.EndCommand;
+import org.jboss.portal.test.framework.container.client.command.RethrowCommand;
 import org.jboss.portal.test.framework.container.result.Result;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.container.server.TestCaseContextAccessorServiceMBean;
 import org.jboss.portal.test.framework.server.Node;
 import org.jboss.portal.test.framework.server.NodeId;
-import org.jboss.mx.util.MBeanProxy;
 
-import java.util.Collection;
+import javax.management.MBeanServer;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.AssertionFailedError;
-
-import javax.management.MBeanServer;
-
 /**
  * Base class for portlet test case.
  *
@@ -138,17 +137,13 @@
       this.suite = suite;
    }
 
-   /**
-    * Override with the test case id.
-    */
+   /** Override with the test case id. */
    public final String getName()
    {
       return testCaseId;
    }
 
-   /**
-    * Perform the test run.
-    */
+   /** Perform the test run. */
    protected final void runTest() throws Throwable
    {
       log.info("# Starting '" + testCaseId + "' test");
@@ -173,7 +168,7 @@
          else if (cmd instanceof RethrowCommand)
          {
             log.info("# Ending test: '" + testCaseId + "' by rethrowing exception from test case'");
-            throw ((RethrowCommand)cmd).getThrowable();
+            throw((RethrowCommand)cmd).getThrowable();
          }
          else if (cmd instanceof DoPostCommand)
          {
@@ -279,7 +274,7 @@
                requestCount++;
                return result.createCommand();
             }
-         // Send redirect
+            // Send redirect
          case 302:
             // If any result has been setup during the action it overrides the 302 code
             if (result != null)

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestCaseContextAccessorProxy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client;
 
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.container.TestCaseContextAccessor;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.portal.test.framework.container.server.TestCaseContextAccessorServiceMBean;
-import org.jboss.mx.util.MBeanProxy;
 
 import javax.management.MBeanServer;
 

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/TestSuite.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client;
 
 import junit.framework.TestCase;
@@ -29,10 +30,10 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 import org.jboss.portal.test.framework.TestRuntimeContext;
-import org.jboss.portal.test.framework.server.NodeManager;
+import org.jboss.portal.test.framework.deployment.Deployer;
 import org.jboss.portal.test.framework.server.Node;
 import org.jboss.portal.test.framework.server.NodeId;
-import org.jboss.portal.test.framework.deployment.Deployer;
+import org.jboss.portal.test.framework.server.NodeManager;
 
 import java.io.File;
 import java.net.URL;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/ClientCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client.command;
 
 /**

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoGetCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client.command;
 
+import java.util.Collections;
 import java.util.Map;
-import java.util.Collections;
 
 /**
  * Perform a get.

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/DoPostCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client.command;
 
 import java.util.Map;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/EndCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client.command;
 
 /**

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/client/command/RethrowCommand.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.client.command;
 
 /**

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/result/AssertResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.result;
 
+import junit.framework.AssertionFailedError;
 import org.apache.log4j.Logger;
 import org.jboss.portal.common.junit.ExtendedAssert;
+import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 import org.jboss.portal.test.framework.container.client.command.EndCommand;
 import org.jboss.portal.test.framework.container.client.command.RethrowCommand;
-import org.jboss.portal.test.framework.container.client.command.ClientCommand;
-import junit.framework.AssertionFailedError;
 
 /**
  * A set of assertions as result.
@@ -67,7 +68,7 @@
     *
     * @param test the test to execute
     * @throws IllegalArgumentException if test is null
-    * @throws IllegalStateException if the test is already failed
+    * @throws IllegalStateException    if the test is already failed
     */
    public void execute(Test test) throws IllegalArgumentException, IllegalStateException
    {
@@ -107,17 +108,13 @@
       public abstract void run() throws Exception;
    }
 
-   /**
-    * Return the recorded throwable or null if nothing has been recorded.
-    */
+   /** Return the recorded throwable or null if nothing has been recorded. */
    public Throwable getThrowable()
    {
       return throwable;
    }
 
-   /**
-    * Return true if throwable is null.
-    */
+   /** Return true if throwable is null. */
    public boolean isFailed()
    {
       return throwable != null;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/result/EndTestResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.result;
 
+import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 import org.jboss.portal.test.framework.container.client.command.EndCommand;
-import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/result/FailureResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.result;
 
 import junit.framework.AssertionFailedError;
+import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 import org.jboss.portal.test.framework.container.client.command.RethrowCommand;
-import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokeGetResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.result;
 
+import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 import org.jboss.portal.test.framework.container.client.command.DoGetCommand;
-import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/result/InvokePostResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.result;
 
+import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 import org.jboss.portal.test.framework.container.client.command.DoPostCommand;
-import org.jboss.portal.test.framework.container.client.command.ClientCommand;
 
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Set;
-import java.util.Collections;
-import java.io.Serializable;
 
 /**
  * The portlet wants to invoke a post.

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/result/Result.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/result/Result.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/result/Result.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.result;
 
 import org.jboss.portal.test.framework.container.client.command.ClientCommand;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.server;
 
+import org.jboss.portal.test.framework.container.TestCaseContext;
 import org.jboss.system.ServiceMBeanSupport;
-import org.jboss.portal.test.framework.container.TestCaseContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/container/server/TestCaseContextAccessorServiceMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.container.server;
 
 import org.jboss.mx.util.ObjectNameFactory;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.deployment;
 
 import org.jboss.portal.test.framework.server.Node;
@@ -27,11 +28,11 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Collection;
-import java.util.Collections;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -109,15 +110,8 @@
     * Try to discover the URL for the deployment archive based on the archive name and "standard" archive locations
     * (relative to the where the test is executed):
     * <p/>
-    * <ul>
-    * <li>.</li>
-    * <li>output/libs/</li>
-    * <li>test/outputs/libs/</li>
-    * <li>output/lib/</li>
-    * <li>test/output/lib/</li>
-    * <li>../output/lib/</li>
-    * <li>../test/output/lib/</li>
-    * </ul>
+    * <ul> <li>.</li> <li>output/libs/</li> <li>test/outputs/libs/</li> <li>output/lib/</li> <li>test/output/lib/</li>
+    * <li>../output/lib/</li> <li>../test/output/lib/</li> </ul>
     *
     * @param archive the name of the archive to deploy
     * @return a URL pointing to the archive to be deployed

Modified: trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/deployment/Deployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,43 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.deployment;
 
+import junit.framework.AssertionFailedError;
+import org.apache.log4j.Logger;
 import org.jboss.deployment.DeploymentException;
 import org.jboss.portal.test.framework.server.Node;
-import org.apache.log4j.Logger;
 
-import javax.management.ObjectName;
-import javax.management.MBeanException;
 import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
 import javax.management.ReflectionException;
-import javax.management.MBeanServer;
-import java.net.URL;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Collection;
 import java.util.Iterator;
 
-import junit.framework.AssertionFailedError;
-
 /**
  * A deployment in the portlet container.
  *
@@ -62,11 +62,11 @@
    {
       if (nodes == null)
       {
-          throw new IllegalArgumentException("Does not accept null argument");
+         throw new IllegalArgumentException("Does not accept null argument");
       }
       if (url == null)
       {
-          throw new IllegalArgumentException("Does not accept null argument");
+         throw new IllegalArgumentException("Does not accept null argument");
       }
       this.nodes = nodes;
       this.url = url;
@@ -76,8 +76,9 @@
    /**
     * Deploy a portlet application. This method blocks until the deployment is finished
     *
-    * @throws org.jboss.deployment.DeploymentException if the deployment process failed
-    * @throws IllegalStateException if the session if closed
+    * @throws org.jboss.deployment.DeploymentException
+    *                                  if the deployment process failed
+    * @throws IllegalStateException    if the session if closed
     * @throws IllegalArgumentException if the application name does not give a valid deployment
     * @throws java.io.IOException
     */
@@ -96,10 +97,10 @@
             Node node = (Node)i.next();
             MBeanServer server = node.getServer();
             server.invoke(
-                  new ObjectName("portal:service=MainDeployerFacade"),
-                  "deploy",
-                  new Object[]{url},
-                  new String[]{URL.class.getName()});
+               new ObjectName("portal:service=MainDeployerFacade"),
+               "deploy",
+               new Object[]{url},
+               new String[]{URL.class.getName()});
          }
       }
       catch (MBeanException e)
@@ -107,7 +108,7 @@
          Exception te = e.getTargetException();
          if (te instanceof DeploymentException)
          {
-            throw (DeploymentException)te;
+            throw(DeploymentException)te;
          }
          else
          {
@@ -139,9 +140,7 @@
       deployed = true;
    }
 
-   /**
-    * Undeploy a portlet application. This method blocks until the undeployment is finished.
-    */
+   /** Undeploy a portlet application. This method blocks until the undeployment is finished. */
    public void undeploy()
    {
       URL url = this.url;
@@ -155,10 +154,10 @@
             Node node = (Node)i.next();
             MBeanServer server = node.getServer();
             server.invoke(
-                  new ObjectName("portal:service=MainDeployerFacade"),
-                  "undeploy",
-                  new Object[]{url},
-                  new String[]{URL.class.getName()});
+               new ObjectName("portal:service=MainDeployerFacade"),
+               "undeploy",
+               new Object[]{url},
+               new String[]{URL.class.getName()});
          }
          catch (Exception e)
          {

Modified: trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacade.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.deployment;
 
 import org.jboss.deployment.DeploymentException;
@@ -28,12 +29,10 @@
 import java.net.URL;
 
 /**
- *
- * This is a hack for testing. We log the deployment exception in the MainDeployerProxy that keeps
- * exception in a thread local and rethrow them once deployment is finished. We are forced to do that
- * because the deployment mechanism we have is based on JMX notifications isolate the two deployment
- * layers (JBoss AS and JBoss Portal).
- *
+ * This is a hack for testing. We log the deployment exception in the MainDeployerProxy that keeps exception in a thread
+ * local and rethrow them once deployment is finished. We are forced to do that because the deployment mechanism we have
+ * is based on JMX notifications isolate the two deployment layers (JBoss AS and JBoss Portal).
+ * <p/>
  * Having deployment interception will solve the problem.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -108,9 +107,7 @@
       }
    }
 
-   /**
-    * Just a place holder for the deployment exception.
-    */
+   /** Just a place holder for the deployment exception. */
    private static class Session
    {
       private DeploymentException e;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/deployment/MainDeployerFacadeMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.deployment;
 
+import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.deployment.DeploymentException;
 
 import java.net.URL;
 
@@ -33,7 +34,10 @@
 public interface MainDeployerFacadeMBean
 {
    MainDeployerMBean getMainDeployer();
+
    void setMainDeployer(MainDeployerMBean mainDeployer);
+
    void deploy(URL url) throws DeploymentException;
+
    void undeploy(URL url) throws DeploymentException;
 }

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/ConnectionManagerSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded;
 
 import org.jboss.resource.connectionmanager.CachedConnectionManager;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/DSConfig.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded;
 
 import org.jboss.portal.common.junit.metadata.TestCaseParameterIterableValue;
@@ -27,12 +28,12 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.io.InputStream;
 import java.net.URL;
-import java.util.List;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.io.InputStream;
+import java.util.List;
 
 /**
  * Configuration of LDAP Directory Server used for tests. Corresponds with directories.xml file

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/DataSourceSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,45 +1,46 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded;
 
+import org.jboss.portal.common.junit.metadata.TestCaseParameterIterableValue;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.common.util.XML;
+import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource;
 import org.jboss.resource.connectionmanager.CachedConnectionManagerReference;
-import org.jboss.resource.adapter.jdbc.local.LocalTxDataSource;
-import org.jboss.portal.common.util.XML;
-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.common.junit.metadata.TestCaseParameterIterableValue;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
-import javax.naming.InitialContext;
+import java.io.InputStream;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Hashtable;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Arrays;
 import java.util.List;
-import java.net.URL;
-import java.sql.Connection;
-import java.sql.Statement;
-import java.io.InputStream;
 
 /**
  * An helper to setup JDNI available objects
@@ -262,7 +263,7 @@
          {
             in = Tools.safeBufferedWrapper(url.openStream());
             Document doc = XML.getDocumentBuilderFactory().newDocumentBuilder().parse(in);
-            for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "datasource");i.hasNext();)
+            for (Iterator i = XML.getChildrenIterator(doc.getDocumentElement(), "datasource"); i.hasNext();)
             {
                Element childElt = (Element)i.next();
                Element displayNameElt = XML.getUniqueChild(childElt, "display-name", true);

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/HibernateSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,40 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded;
 
+import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
-import org.hibernate.HibernateException;
 import org.hibernate.Transaction;
 import org.hibernate.TransactionException;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Settings;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
 
 import javax.transaction.Synchronization;
-import java.util.Properties;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Properties;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -101,7 +102,7 @@
       for (Iterator i = mappings.iterator(); i.hasNext();)
       {
          String mapping = (String)i.next();
-         cfg.addResource(mapping,  Thread.currentThread().getContextClassLoader());
+         cfg.addResource(mapping, Thread.currentThread().getContextClassLoader());
       }
 
       //
@@ -196,9 +197,7 @@
    {
    }
 
-   /**
-    * Try to commit the transaction and return true if the commit was succesful
-    */
+   /** Try to commit the transaction and return true if the commit was succesful */
    public boolean commitTransaction()
    {
       Session currentSession = getCurrentSession();
@@ -230,9 +229,7 @@
       }
    }
 
-   /**
-    * Rollback the transaction and return true if the rollback was succesful
-    */
+   /** Rollback the transaction and return true if the rollback was succesful */
    public void rollbackTransaction()
    {
       Session currentSession = getCurrentSession();
@@ -271,6 +268,7 @@
             public void beforeCompletion()
             {
             }
+
             public void afterCompletion(int i)
             {
                session = null;
@@ -298,6 +296,7 @@
          public void beforeCompletion()
          {
          }
+
          public void afterCompletion(int i)
          {
             session = null;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/JNDISupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded;
 
 import org.jnp.interfaces.NamingContext;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/TransactionManagerSupport.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded;
 
+import org.jboss.resource.connectionmanager.TransactionSynchronizer;
+import org.jboss.tm.TxManager;
+import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
 import org.jboss.util.naming.NonSerializableFactory;
-import org.jboss.tm.usertx.client.ServerVMClientUserTransaction;
-import org.jboss.tm.TxManager;
-import org.jboss.resource.connectionmanager.TransactionSynchronizer;
 
+import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
-import javax.naming.InitialContext;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSService.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,51 +1,51 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded.apacheds;
 
-import org.jboss.system.ServiceMBeanSupport;
 import org.apache.directory.server.configuration.MutableServerStartupConfiguration;
+import org.apache.directory.server.core.configuration.Configuration;
 import org.apache.directory.server.core.configuration.MutablePartitionConfiguration;
-import org.apache.directory.server.core.configuration.Configuration;
 import org.apache.directory.server.core.configuration.ShutdownConfiguration;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
+import org.jboss.system.ServiceMBeanSupport;
 
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.Attributes;
 import javax.naming.directory.InitialDirContext;
-import javax.naming.NamingException;
-import javax.naming.Context;
+import java.io.File;
+import java.net.URL;
 import java.security.PrivilegedAction;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.Set;
-import java.util.Hashtable;
-import java.net.URL;
-import java.io.File;
 
 
 /**
  * XMBean Service for ApacheDS integration
  * <p/>
- * based on code snippets taken from apache directory examples from
- * http://docs.safehaus.org/display/APACHEDS/Embedding+ApacheDS
+ * based on code snippets taken from apache directory examples from http://docs.safehaus.org/display/APACHEDS/Embedding+ApacheDS
  * https://svn.safehaus.org/repos/sandbox/apachecon/ by akarasulu at apache.org
  *
  * @author <a href="mailto:Boleslaw dot Dawidowicz at jboss dot com">Boleslaw Dawidowicz</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSServiceMBean.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSServiceMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/apacheds/ApacheDSServiceMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded.apacheds;
 
 import org.jboss.system.ServiceMBean;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,43 +1,39 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded.opends;
 
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.jboss.system.ServiceMBeanSupport;
 //import org.opends.server.core.DirectoryServer;
 
 
 /**
- *  Class forked from JBoss Application Server testsuite:
- *  http://anonsvn.jboss.org/repos/jbossas/trunk/testsuite/src/main/org/jboss/test/security/test/opends/
+ * Class forked from JBoss Application Server testsuite: http://anonsvn.jboss.org/repos/jbossas/trunk/testsuite/src/main/org/jboss/test/security/test/opends/
+ * <p/>
+ * XMBean Service for OpenDS integration
  *
- *  XMBean Service for OpenDS integration
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @author <a href="mailto:Boleslaw dot Dawidowicz at jboss dot com">Boleslaw Dawidowicz</a>
- *  @version $Revision$
- *  @since  Sep 13, 2006
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @author <a href="mailto:Boleslaw dot Dawidowicz at jboss dot com">Boleslaw Dawidowicz</a>
+ * @version $Revision$
+ * @since Sep 13, 2006
  */
 public class OpenDSService //extends ServiceMBeanSupport implements OpenDSServiceMBean
 {
@@ -46,7 +42,6 @@
    private String newline = (String)
             AccessController.doPrivileged(new GetSystemPropertyAction("line.separator"));*/
 
-
    /**
     * Print some information about the DS (eg: connections etc)
     * @return
@@ -99,8 +94,6 @@
       DirectoryServer.shutDown(getClass().getName(), "Shut down DS");
    }*/
 
-
-
    /**
     *
     * A GetSystemPropetyAction.

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSServiceMBean.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded.opends;
 
 import org.jboss.system.ServiceMBean;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSUtil.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSUtil.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/embedded/opends/OpenDSUtil.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,27 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.embedded.opends;
 
-import java.io.File;
-import java.net.URL;
-import java.util.StringTokenizer;
-
 import org.jboss.logging.Logger;
 /*import org.opends.server.tools.LDAPCompare;
 import org.opends.server.tools.LDAPDelete;
@@ -32,13 +29,13 @@
 import org.opends.server.tools.LDAPSearch;*/
 
 /**
- *  Class forked from JBoss Application Server testsuite:
- *  http://anonsvn.jboss.org/repos/jbossas/trunk/testsuite/src/main/org/jboss/test/security/test/opends/
+ * Class forked from JBoss Application Server testsuite: http://anonsvn.jboss.org/repos/jbossas/trunk/testsuite/src/main/org/jboss/test/security/test/opends/
+ * <p/>
+ * Utility class that deals with the integrated ldap (OpenDS)
  *
- *  Utility class that deals with the integrated ldap (OpenDS)
- *  @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
- *  @version $Revision$
- *  @since  Sep 15, 2006
+ * @author <a href="mailto:Anil.Saldhana at jboss.org">Anil Saldhana</a>
+ * @version $Revision$
+ * @since Sep 15, 2006
  */
 public class OpenDSUtil
 {
@@ -73,7 +70,7 @@
 
    /**
     * Delete a DN in the Directory Server
-   * @param serverHost Server Host (Use getServerHost() of JBossTestxxx)
+    * @param serverHost Server Host (Use getServerHost() of JBossTestxxx)
     * @param port Port for the DS
     * @param admin admin dn ("cn=Directory Manager")
     * @param adminpwd (password)
@@ -116,7 +113,7 @@
     * @param cmdline
     * @return whether ldapCompare was success
     */
-  /* public boolean ldapCompare(String cmdline)
+   /* public boolean ldapCompare(String cmdline)
    {
       String[] strArr = getStringArr(cmdline);
       log.debug("ldapCompare:"+print(strArr));

Modified: trunk/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.jmx;
 
 import javax.management.MBeanServer;
 import javax.management.MBeanServerConnection;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import java.util.Properties;
 import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.lang.reflect.Method;
+import java.util.Properties;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.jmx;
 
 import org.jboss.mx.util.MBeanProxy;
 
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
-import javax.management.MBeanServerConnection;
-import javax.management.MBeanServer;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.jmx;
 
 import javax.management.MBeanServer;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/server/Node.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.server;
 
 import javax.management.MBeanServer;

Modified: trunk/test/src/main/org/jboss/portal/test/framework/server/NodeId.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/server/NodeId.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/server/NodeId.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.server;
 
 import java.io.Serializable;
@@ -85,7 +86,7 @@
     * Return the current node id.
     *
     * @return the current node id
-    * @throws IllegalStateException if not in a node context 
+    * @throws IllegalStateException if not in a node context
     */
    public static NodeId locate() throws IllegalStateException
    {

Modified: trunk/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/main/org/jboss/portal/test/framework/server/NodeManager.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.framework.server;
 
-import org.jboss.portal.test.framework.server.Node;
-import org.jboss.portal.test.framework.server.NodeId;
-
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>

Modified: trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml
===================================================================
--- trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/resources/portal-test-jar/org/jboss/portal/test/framework/container/jboss-beans.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,12 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
             xmlns="urn:jboss:bean-deployer">
 
    <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
       <property name="env">
-         <map  class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+         <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
             <entry>
                <key>java.naming.factory.initial</key>
                <value>org.jnp.interfaces.NamingContextFactory</value>
@@ -25,7 +48,7 @@
 
    <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
       <property name="env">
-         <map  class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+         <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
             <entry>
                <key>java.naming.factory.initial</key>
                <value>org.jnp.interfaces.NamingContextFactory</value>
@@ -44,7 +67,7 @@
 
    <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
       <property name="env">
-         <map  class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+         <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
             <entry>
                <key>java.naming.factory.initial</key>
                <value>org.jnp.interfaces.NamingContextFactory</value>

Modified: trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/test/src/resources/portal-test-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
    <!-- Only used by the remote tests -->
    <mbean

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/testsuite/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
    <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
    <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/testsuite/imports/server-config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,16 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <project name="server-config" default="help"
          xmlns:server="http://jboss.org/ns/test/ant/server">
 
    <!-- PROPERTIES -->
    <property environment="env"/>
    <property name="jboss.dist" value="${env.JBOSS_HOME}"/>
-   <property name="node0" value="localhost" />
+   <property name="node0" value="localhost"/>
    <property name="project.tools" value="../tools"/>
    <property name="udpGroup" value="239.3.4.67"/>
-   <property name="node0.jndi.url" value="jnp://${node0}:1099" />   
+   <property name="node0.jndi.url" value="jnp://${node0}:1099"/>
    <!-- Override for non-Sun compatible JDK layouts -->
    <property name="javac.jar" value="${env.JAVA_HOME}/lib/tools.jar"/>
    <!-- Override with the jpda settings for debugging start-jboss. An example
@@ -18,7 +41,7 @@
    -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y
    An example of running with the -Xrunyjpagent
    -->
-   <property name="jpda.cmdline" value="" />
+   <property name="jpda.cmdline" value=""/>
    <!--<property name="jpda.cmdline" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787" />-->
 
    <path id="jboss.boot.classpath">
@@ -46,7 +69,7 @@
          <os family="windows"/>
       </not>
    </condition>
-   
+
    <!-- Server Config Classpath, also used for JUnit formatting -->
    <path id="jboss.test.classpath">
            <filelist dir="${project.tools}/lib">
@@ -72,9 +95,9 @@
    <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}"
                   udpGroup="${udpGroup}">
       <server name="default" host="${node0}">
-         <jvmarg value="${jpda.cmdline}" />
-         <jvmarg value="-Xmx128m" />
-         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+         <jvmarg value="${jpda.cmdline}"/>
+         <jvmarg value="-Xmx128m"/>
+         <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
       </server>      
    </server:config>
 

Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/build.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,12 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE project [
-      <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
-      <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
-      <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
-      <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
-      <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
-      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
-      ]>
+   <!ENTITY libraries  SYSTEM "../thirdparty/libraries.ent">
+   <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+   <!ENTITY tools      SYSTEM "../tools/etc/buildfragments/tools.ent">
+   <!ENTITY modules    SYSTEM "../tools/etc/buildfragments/modules.ent">
+   <!ENTITY defaults   SYSTEM "../tools/etc/buildfragments/defaults.ent">
+   <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
+   ]>
 
 <!-- $Id$ -->
 
@@ -189,9 +212,9 @@
 
    <target name="style" depends="init">
       <xslt
-            style="${source.resources}/style/toto.xsl"
-            in="${source.resources}/test/default-portal.xml"
-            out="${build.resources}/test/toto.xml">
+         style="${source.resources}/style/toto.xsl"
+         in="${source.resources}/test/default-portal.xml"
+         out="${build.resources}/test/toto.xml">
       </xslt>
    </target>
 

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestHelper.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme;
 
 import org.jboss.portal.Mode;

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestLayoutServiceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme;
 
 import junit.framework.TestCase;
-import org.jboss.portal.theme.PortalLayout;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ServerRegistrationID;
-import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.impl.LayoutServiceImpl;
 import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/TestPortalThemeImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,39 +1,37 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme;
 
 import junit.framework.TestCase;
-import org.jboss.portal.common.util.XML;
-import org.jboss.portal.theme.ThemeException;
 import org.jboss.portal.theme.deployment.jboss.PortalThemeMetaDataFactory;
 import org.jboss.portal.theme.metadata.PortalThemeMetaData;
 import org.jboss.xb.binding.UnmarshallerFactory;
-import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
-import java.util.List;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 
 /**
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestLayoutStrategySetMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme.metadata;
 
 import junit.framework.TestCase;
@@ -29,9 +30,9 @@
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
-import java.util.List;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 
 /**
  * Test Layout Strategy (Set) MetaData

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalLayoutMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme.metadata;
 
 import junit.framework.TestCase;
@@ -26,8 +27,8 @@
 import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 import org.jboss.xb.binding.UnmarshallerFactory;
 
+import java.io.StringReader;
 import java.util.List;
-import java.io.StringReader;
 
 /**
  * Test all aspects of the portal layout meta data.

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestPortalThemeMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,69 +1,53 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme.metadata;
 
 import junit.framework.TestCase;
-import org.jboss.portal.common.util.XML;
-import org.jboss.portal.theme.ThemeException;
 import org.jboss.portal.theme.deployment.jboss.PortalThemeMetaDataFactory;
 import org.jboss.portal.theme.metadata.PortalThemeMetaData;
 import org.jboss.portal.theme.metadata.ThemeLinkMetaData;
 import org.jboss.portal.theme.metadata.ThemeScriptMetaData;
 import org.jboss.xb.binding.UnmarshallerFactory;
-import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
-import java.util.List;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 
 /**
  * Testcase for the portal theme meta data parsing from the descriptor
  * <p/>
  * example descriptor:
  * <p/>
- * <themes>
- * <theme>
- * <name>industrial</name>
- * <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css" type="text/css" />
- * <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico" />
- * </theme>
- * <theme>
- * <name>Nphalanx</name>
- * <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css" />
- * <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico" />
- * </theme>
- * <theme>
- * <name>mission-critical</name>
- * <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css" />
- * <link rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico" />
- * </theme>
- * <theme>
- * <name>Maple</name>
- * <link rel="stylesheet" id="main_css" href="/themes/maple/portal_style.css" type="text/css"/>
- * <link rel="shortcut icon" href="/themes/maple/images/favicon.ico"/>
- * </theme>
- * </themes> *
+ * <themes> <theme> <name>industrial</name> <link rel="stylesheet" id="main_css" href="/themes/industrial/portal_style.css"
+ * type="text/css" /> <link rel="shortcut icon" href="/themes/industrial/images/favicon.ico" /> </theme> <theme>
+ * <name>Nphalanx</name> <link rel="stylesheet" id="main_css" href="/themes/phalanx/portal_style.css" type="text/css" />
+ * <link rel="shortcut icon" href="/themes/phalanx/images/favicon.ico" /> </theme> <theme> <name>mission-critical</name>
+ * <link rel="stylesheet" id="main_css" href="/themes/mission-critical/portal_style.css" type="text/css" /> <link
+ * rel="shortcut icon" href="/themes/mission-critical/images/favicon.ico" /> </theme> <theme> <name>Maple</name> <link
+ * rel="stylesheet" id="main_css" href="/themes/maple/portal_style.css" type="text/css"/> <link rel="shortcut icon"
+ * href="/themes/maple/images/favicon.ico"/> </theme> </themes> *
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/metadata/TestRenderSetMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.test.theme.metadata;
 
 import junit.framework.TestCase;
@@ -30,9 +31,9 @@
 import org.xml.sax.SAXException;
 
 import javax.xml.parsers.ParserConfigurationException;
-import java.util.List;
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 
 /**
  * Test cases for the render set meta data
@@ -40,24 +41,16 @@
  * <p/>
  * exmaple of a render set descriptor:
  * <p/>
- * <portal-renderSet>
- * <renderSet name="divRenderer">
- * <set content-type="text/html">
+ * <portal-renderSet> <renderSet name="divRenderer"> <set content-type="text/html">
  * <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * <renderSet name="emptyRenderer">
- * <set content-type="text/html">
- * <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> <renderSet name="emptyRenderer"> <set content-type="text/html"> <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * </portal-renderSet>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> </portal-renderSet>
  * <p/>
  * </p>
  *

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/render/TestRenderContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.test.theme.render;
 
 import junit.framework.TestCase;
@@ -8,8 +31,8 @@
 import org.jboss.portal.test.theme.TestHelper;
 import org.jboss.portal.theme.LayoutService;
 import org.jboss.portal.theme.PortalLayout;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 import org.jboss.portal.theme.metadata.RenderSetMetaData;
 import org.jboss.portal.theme.navigation.WindowNavigationalState;
@@ -65,6 +88,7 @@
          {
             throw new UnsupportedOperationException();
          }
+
          public void setAttribute(Object attrKey, Object attrValue) throws IllegalArgumentException
          {
             throw new UnsupportedOperationException();
@@ -179,10 +203,7 @@
       assertNotNull(ctx.getPortletRenderer());
    }
 
-   /**
-    * Test the overwrite behaviour of window properties
-    * Window Properties can
-    */
+   /** Test the overwrite behaviour of window properties Window Properties can */
    public void testRenderContext3()
    {
       Map windowProperties = new HashMap();

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestAJAXServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.theme.servlet;
 
@@ -32,28 +33,26 @@
 import java.util.Date;
 import java.util.Enumeration;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 
 public class TestAJAXServlet extends HttpServlet
 {
    private final static Logger log = Logger.getLogger(TestAJAXServlet.class);
 
    public void doGet(HttpServletRequest req, HttpServletResponse resp)
-         throws ServletException, IOException
+      throws ServletException, IOException
    {
       doPost(req, resp);
    }
 
    public void doPost(HttpServletRequest req, HttpServletResponse resp)
-         throws ServletException, IOException
+      throws ServletException, IOException
    {
       Enumeration paramNames = req.getParameterNames();
       String response = "";
-      while(paramNames.hasMoreElements())
+      while (paramNames.hasMoreElements())
       {
-         String name = (String) paramNames.nextElement();
+         String name = (String)paramNames.nextElement();
          // action: windowremove|windowmove
          if ("action".equalsIgnoreCase(name))
          {
@@ -122,7 +121,7 @@
    }
 
    private void sendResp(HttpServletResponse resp, String respData)
-         throws IOException
+      throws IOException
    {
       resp.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
       resp.setDateHeader("Last-Modified", new Date().getTime());

Modified: trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/test/theme/servlet/TestThemeServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.test.theme.servlet;
 
@@ -64,9 +65,7 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
- */
+/** @author <a href="mailto:roy at jboss.org">Roy Russo</a> */
 
 public class TestThemeServlet extends HttpServlet
 {
@@ -76,23 +75,21 @@
 
    private static final String TEST_PAGE_NAME = "TestPage";
 
-   /** How many windows to create on left region **/
+   /** How many windows to create on left region * */
    private static final int LEFT_WINDOWS = 3;
 
-   /** How many windows to create on center region **/
+   /** How many windows to create on center region * */
    private static final int CENTER_WINDOWS = 3;
 
-   /**
-    * Set theme api services
-    */
+   /** Set theme api services */
    public void init()
    {
       try
       {
          MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
-         LayoutService layoutService = (LayoutService) MBeanProxy.get(LayoutService.class, new ObjectName("portal:service=LayoutService"), mbeanServer);
-         ThemeService themeService = (ThemeService) MBeanProxy.get(ThemeService.class, new ObjectName("portal:service=ThemeService"), mbeanServer);
-         PageService pageService = (PageService) MBeanProxy.get(PageService.class, new ObjectName("portal:service=PageService"), mbeanServer);
+         LayoutService layoutService = (LayoutService)MBeanProxy.get(LayoutService.class, new ObjectName("portal:service=LayoutService"), mbeanServer);
+         ThemeService themeService = (ThemeService)MBeanProxy.get(ThemeService.class, new ObjectName("portal:service=ThemeService"), mbeanServer);
+         PageService pageService = (PageService)MBeanProxy.get(PageService.class, new ObjectName("portal:service=PageService"), mbeanServer);
 
          ClassLoader loader = Thread.currentThread().getContextClassLoader();
          RuntimeContext runtimeContext = new RuntimeContext("TestAppId", getServletContext(), "/theme-test", loader);
@@ -101,10 +98,10 @@
          InputStream in = null;
          in = getServletContext().getResourceAsStream("/WEB-INF/portal-layouts.xml");
          Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-         List portalLayouts = (List) unmarshaller.unmarshal(in, new PortalLayoutMetaDataFactory(), null);
-         for(Iterator i = portalLayouts.iterator(); i.hasNext();)
+         List portalLayouts = (List)unmarshaller.unmarshal(in, new PortalLayoutMetaDataFactory(), null);
+         for (Iterator i = portalLayouts.iterator(); i.hasNext();)
          {
-            PortalLayoutMetaData layoutMD = (PortalLayoutMetaData) i.next();
+            PortalLayoutMetaData layoutMD = (PortalLayoutMetaData)i.next();
             layoutService.addLayout(runtimeContext, layoutMD);
          }
          layout = layoutService.getLayout("generic", true);
@@ -112,10 +109,10 @@
          // add rendersets from metadata
          in = getServletContext().getResourceAsStream("/WEB-INF/layout/portal-renderSet.xml");
          unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-         List renderSets = (List) unmarshaller.unmarshal(in, new RenderSetMetaDataFactory(), null);
-         for(Iterator i = renderSets.iterator(); i.hasNext();)
+         List renderSets = (List)unmarshaller.unmarshal(in, new RenderSetMetaDataFactory(), null);
+         for (Iterator i = renderSets.iterator(); i.hasNext();)
          {
-            RenderSetMetaData renderSetMD = (RenderSetMetaData) i.next();
+            RenderSetMetaData renderSetMD = (RenderSetMetaData)i.next();
             layoutService.addRenderSet(runtimeContext, renderSetMD);
          }
          renderSet = layoutService.getRenderSet("divRenderer", MediaType.HTML);
@@ -123,15 +120,15 @@
          // add themes from metadata
          in = getServletContext().getResourceAsStream("/WEB-INF/portal-themes.xml");
          unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
-         List themes = (List) unmarshaller.unmarshal(in, new PortalThemeMetaDataFactory(), null);
-         for(Iterator i = themes.iterator(); i.hasNext();)
+         List themes = (List)unmarshaller.unmarshal(in, new PortalThemeMetaDataFactory(), null);
+         for (Iterator i = themes.iterator(); i.hasNext();)
          {
-            PortalThemeMetaData themeMD = (PortalThemeMetaData) i.next();
+            PortalThemeMetaData themeMD = (PortalThemeMetaData)i.next();
             themeService.addTheme(runtimeContext, themeMD);
          }
          theme = themeService.getTheme("renaissance", true);
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }
@@ -168,13 +165,13 @@
       // create window ctx/results and add to page result
       for (int i = 0; i < LEFT_WINDOWS; i++)
       {
-         WindowContext wCtx = new WindowContext("WindowA_" + i, "WindowA_"+i, "left", i);
+         WindowContext wCtx = new WindowContext("WindowA_" + i, "WindowA_" + i, "left", i);
          pageResult.addWindowContext(wCtx);
          pageResult.addWindowResult(wCtx.getId(), createWindowMarkup("WindowA_" + i + " Title", "<p>WindowA_" + i + " Content</p>", wCtx, portalProps, pageProps));
       }
       for (int i = 0; i < CENTER_WINDOWS; i++)
       {
-         WindowContext wCtx = new WindowContext("WindowB_" + i, "WindowB_"+i, "center", i);
+         WindowContext wCtx = new WindowContext("WindowB_" + i, "WindowB_" + i, "center", i);
          pageResult.addWindowContext(wCtx);
          pageResult.addWindowResult(wCtx.getId(), createWindowMarkup("WindowB_" + i + " Title", "<p>WindowB_" + i + " Content</p>", wCtx, portalProps, pageProps));
       }
@@ -192,7 +189,7 @@
          LayoutDispatcher dispatcher1 = new LayoutDispatcher(renderCtx, httpServletRequest, httpServletResponse, pageResult);
          dispatcher1.include();
       }
-      catch(Exception e)
+      catch (Exception e)
       {
          e.printStackTrace();
       }
@@ -205,6 +202,7 @@
 
    /**
     * Generates the WindowResult for our windowcontext
+    *
     * @param sTitle
     * @param sContent
     * @param wCtx

Modified: trunk/theme/src/main/org/jboss/portal/theme/FQN.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/FQN.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/FQN.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import java.io.IOException;
@@ -70,7 +71,7 @@
       }
       this.names = new String[names.length];
       this.hashCode = 0;
-      for (int i = 0;i < names.length;i++)
+      for (int i = 0; i < names.length; i++)
       {
          String name = names[i];
          if (name == null)
@@ -156,7 +157,7 @@
       {
          return false;
       }
-      for (int i = 0;i < parent.names.length;i++)
+      for (int i = 0; i < parent.names.length; i++)
       {
          Object name = parent.names[i];
          if (!name.equals(names[i]))
@@ -182,7 +183,7 @@
       {
          return false;
       }
-      for (int i = 0;i < names.length;i++)
+      for (int i = 0; i < names.length; i++)
       {
          if (!names[i].equals(other.names[i]))
          {
@@ -201,7 +202,7 @@
       if (hashCode == 0)
       {
          int tmp = 0;
-         for (int i = 0;i < names.length;i++)
+         for (int i = 0; i < names.length; i++)
          {
             tmp = tmp * 29 + names[i].hashCode();
          }
@@ -213,7 +214,7 @@
    public String toString()
    {
       StringBuffer buffer = new StringBuffer();
-      for (int i = 0;i < names.length;i++)
+      for (int i = 0; i < names.length; i++)
       {
          buffer.append('/').append(names[i]);
       }

Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutConstants.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/LayoutConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/LayoutConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 /**
@@ -33,16 +34,12 @@
    {
    }
 
-   /**
-    * Attribute used to store and retrieve the current page
-    */
+   /** Attribute used to store and retrieve the current page */
    public static final String ATTR_PAGE = "PAGE";
 
    public static final String ATTR_RENDERCONTEXT = "RENDERCONTEXT";
 
-   /**
-    * currently not used
-    */
+   /** currently not used */
    public static final String ATTR_LAYOUT = "_layout";
    public static final String PARAM_LAYOUT_URI = "layoutURI";
    public static final String PARAM_LAYOUT_STATE = "layoutState";

Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/LayoutDispatcher.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import org.apache.log4j.Logger;
@@ -39,9 +40,9 @@
 import java.io.Writer;
 
 /**
- * Dispatches the request to the target layout. The major side effect is to change the context path
- * returned by the request to the value returned by <code>PortalLayout#getContextPath()</code> so the layout
- * can safely use the getContextPath in order to designates resources located in the same web application.
+ * Dispatches the request to the target layout. The major side effect is to change the context path returned by the
+ * request to the value returned by <code>PortalLayout#getContextPath()</code> so the layout can safely use the
+ * getContextPath in order to designates resources located in the same web application.
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -51,9 +52,7 @@
 
    private static final Logger log = Logger.getLogger(LayoutDispatcher.class);
 
-   /**
-    * The layout
-    */
+   /** The layout */
    private final HttpServletRequest request;
    private final HttpServletResponse response;
    private final MarkupResult markupResult;
@@ -109,9 +108,7 @@
       chain.doFilter(wrapper, resp);
    }
 
-   /**
-    * Perform the dispatch to the target layout
-    */
+   /** Perform the dispatch to the target layout */
 //   public void include(PortalRequest req, PortalResponse resp) throws IOException, ServletException
    public void include() throws IOException, ServletException
    {

Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutException.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/LayoutException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/LayoutException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutInfo.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/LayoutInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/LayoutInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme;
 
 import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
@@ -68,9 +91,9 @@
    }
 
    /**
-    * Get the generic URI for this layout.
-    * <p>The URI is the location of the layout resource inside the Servlet context that contains it.
-    * The generic URI is the one that does not depend on a state. It is the most common URI for this layout.</p>
+    * Get the generic URI for this layout. <p>The URI is the location of the layout resource inside the Servlet context
+    * that contains it. The generic URI is the one that does not depend on a state. It is the most common URI for this
+    * layout.</p>
     *
     * @return the URI for this layout
     * @see #getServletContext()
@@ -84,9 +107,9 @@
    /**
     * Get the uri, the location of the layout, relative to its context.
     *
-    * @param state an optional key to further separate URIs (for example for maximized window state).
-    *              If a layout uri was defined for the provided state, that uri will be returned, otherwise the generic
-    *              URI for this layout will be returned. If null is provided, the result is the same as calling getURI()
+    * @param state an optional key to further separate URIs (for example for maximized window state). If a layout uri
+    *              was defined for the provided state, that uri will be returned, otherwise the generic URI for this
+    *              layout will be returned. If null is provided, the result is the same as calling getURI()
     * @return the uri of the layout relative to its context
     * @see #getServletContext()
     * @see #getURI
@@ -122,9 +145,7 @@
       return ctx.getContextPath();
    }
 
-   /**
-    * @see PortalLayoutMetaData#getRegionNames
-    */
+   /** @see PortalLayoutMetaData#getRegionNames */
    public List getRegionNames()
    {
       return Collections.unmodifiableList(layoutMD.getRegionNames());

Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/LayoutService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
-import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 import org.jboss.portal.theme.metadata.LayoutStrategyMetaData;
+import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 import org.jboss.portal.theme.metadata.RenderSetMetaData;
 
 /**
@@ -42,9 +43,7 @@
     */
    void setDefaultLayout(String name) throws LayoutException;
 
-   /**
-    * Add a layout.
-    */
+   /** Add a layout. */
    void addLayout(RuntimeContext runtimeContext, PortalLayoutMetaData layoutMD) throws LayoutException;
 
    /**
@@ -55,9 +54,7 @@
     */
    void removeLayouts(String appID) throws LayoutException;
 
-   /**
-    * Register a a portal layout strategy with this service
-    */
+   /** Register a a portal layout strategy with this service */
    void addStrategy(RuntimeContext runtimeContext, LayoutStrategyMetaData strategyMD) throws LayoutException;
 
    /**
@@ -68,9 +65,7 @@
     */
    void removeStrategies(String appID) throws LayoutException;
 
-   /**
-    * Register a renderSet with this service
-    */
+   /** Register a renderSet with this service */
    void addRenderSet(RuntimeContext runtimeContext, RenderSetMetaData renderSet) throws LayoutException;
 
    /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/LayoutServiceInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme;
 
 import org.jboss.portal.common.MediaType;
@@ -20,8 +43,8 @@
     * Get the layout for the provided registration id.
     *
     * @param id            the registration id of the layout to get
-    * @param defaultOnNull true, if the default layout (if any is defined) should be
-    *                      returned in case the requested layout is not found
+    * @param defaultOnNull true, if the default layout (if any is defined) should be returned in case the requested
+    *                      layout is not found
     * @return the requested layout , of the default layout, or null
     */
    PortalLayout getLayout(ServerRegistrationID id, boolean defaultOnNull);
@@ -30,8 +53,8 @@
     * Get the layout for the provided name.
     *
     * @param name          the name of the layout to request
-    * @param defaultOnNull true, if the default layout (if any is defined) should be
-    *                      returned in case the requested layout is not found
+    * @param defaultOnNull true, if the default layout (if any is defined) should be returned in case the requested
+    *                      layout is not found
     * @return the requested layout , of the default layout, or null
     */
    PortalLayout getLayout(String name, boolean defaultOnNull);
@@ -41,7 +64,8 @@
     *
     * @param strategyName the name of the strategy to get
     * @param mediaType    the media type (content-type) to get the strategy for
-    * @return the layout strategy that matches the provided name and mediatype, or null if no such strategy is registered
+    * @return the layout strategy that matches the provided name and mediatype, or null if no such strategy is
+    *         registered
     */
    LayoutStrategy getStrategy(String strategyName, MediaType mediaType);
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
-import org.jboss.portal.theme.render.ModifiableMarkupResult;
-import org.jboss.portal.theme.page.PageService;
-import org.jboss.portal.theme.page.ModifiablePageResult;
-import org.jboss.portal.theme.navigation.PageNavigationalState;
 import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.theme.navigation.PageNavigationalState;
+import org.jboss.portal.theme.page.ModifiablePageResult;
+import org.jboss.portal.theme.page.PageService;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**
@@ -58,9 +58,7 @@
       this.pageService = pageService;
    }
 
-   /**
-    * Performs the page rendition.
-    */
+   /** Performs the page rendition. */
    public void render(ServerInvocation invocation) throws IOException, ServletException
    {
       // If possible and needed, propagate the navigational state of the page into the result

Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/PortalLayout.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import org.jboss.portal.server.ServerInvocation;
@@ -31,30 +32,29 @@
 import java.io.IOException;
 
 /**
- * Implementation of a <code>PortalLayout</code>.
- * <p>An instance of this class represents the meta data of a portal layout.</p>
+ * Implementation of a <code>PortalLayout</code>. <p>An instance of this class represents the meta data of a portal
+ * layout.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
- * @version <tt>$Revision$</tt>
- *          // * @see org.jboss.portal.theme.LayoutService
+ * @version <tt>$Revision$</tt> // * @see org.jboss.portal.theme.LayoutService
  */
 public abstract class PortalLayout
 {
    private LayoutInfo info;
    private LayoutServiceInfo serviceInfo;
 
-   /**
-    * Layouts need an empty constructor (they are loaded via reflection)
-    */
+   /** Layouts need an empty constructor (they are loaded via reflection) */
    public PortalLayout()
    {
    }
 
    /**
-    * Assemble the fragments created by the portlet render process into a response and send it back to the client (write it to the response)
+    * Assemble the fragments created by the portlet render process into a response and send it back to the client (write
+    * it to the response)
     *
     * @param invocation
-    * @param markupResult the result containing the information about what was rendered and what the resulting markup fragments are
+    * @param markupResult the result containing the information about what was rendered and what the resulting markup
+    *                     fragments are
     * @throws ServletException
     * @throws IOException
     */
@@ -73,26 +73,20 @@
       this.serviceInfo = serviceInfo;
    }
 
-   /**
-    * destroy this layout (cleanup time)
-    */
+   /** destroy this layout (cleanup time) */
    public void destroy()
    {
       info = null;
       serviceInfo = null;
    }
 
-   /**
-    * @return the parsed meta data of this layout
-    */
+   /** @return the parsed meta data of this layout */
    public LayoutInfo getLayoutInfo()
    {
       return info;
    }
 
-   /**
-    * @return a reference to the layout service
-    */
+   /** @return a reference to the layout service */
    public LayoutServiceInfo getServiceInfo()
    {
       return serviceInfo;

Modified: trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/PortalTheme.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import org.jboss.portal.server.ServerRequest;
@@ -26,16 +27,13 @@
 
 import java.io.IOException;
 import java.io.Writer;
-import java.util.List;
-import java.util.ArrayList;
 
 /**
- * A portal theme is a collection of tags that will be injected into a layout to govern the
- * look and feel of a portal page.
- * <p>Themes are links to css, javascript and image/resource files. A theme's css needs to cooperate with the
+ * A portal theme is a collection of tags that will be injected into a layout to govern the look and feel of a portal
+ * page. <p>Themes are links to css, javascript and image/resource files. A theme's css needs to cooperate with the
  * markup in the portal layout, the markup produced by the portlets, and the markup produced by the render set.</p>
- * <p>Any theme that the portal will pick up needs to be defined in a theme descriptor. The theme desciptor is an
- * xml file in WEB-INF/ with the file name *-themes.xml</p>
+ * <p>Any theme that the portal will pick up needs to be defined in a theme descriptor. The theme desciptor is an xml
+ * file in WEB-INF/ with the file name *-themes.xml</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -82,26 +80,20 @@
       this.serviceInfo = serviceInfo;
    }
 
-   /**
-    * Destroy the theme. Here is your chance to clean up
-    */
+   /** Destroy the theme. Here is your chance to clean up */
    public void destroy()
    {
       info = null;
       serviceInfo = null;
    }
 
-   /**
-    * @return the theme meta data
-    */
+   /** @return the theme meta data */
    public ThemeInfo getThemeInfo()
    {
       return info;
    }
 
-   /**
-    * @return the theme service info
-    */
+   /** @return the theme service info */
    public ThemeServiceInfo getServiceInfo()
    {
       return serviceInfo;

Modified: trunk/theme/src/main/org/jboss/portal/theme/RuntimeContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/RuntimeContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/RuntimeContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import javax.servlet.ServletContext;

Modified: trunk/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ServerRegistrationID.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 /**
@@ -29,9 +30,7 @@
  */
 public class ServerRegistrationID extends FQN
 {
-   /**
-    * The serialVersionUID
-    */
+   /** The serialVersionUID */
    private static final long serialVersionUID = 8042337046523234207L;
 
    private String desc = null;
@@ -79,24 +78,16 @@
 
    private Type type;
 
-   /**
-    * type for a registered Portal Theme.
-    */
+   /** type for a registered Portal Theme. */
    public static final Type TYPE_THEME = new Type("theme");
 
-   /**
-    * Type for a registered Portal Layout.
-    */
+   /** Type for a registered Portal Layout. */
    public static final Type TYPE_LAYOUT = new Type("layout");
 
-   /**
-    * Type for a registered Portal Layout Strategy.
-    */
+   /** Type for a registered Portal Layout Strategy. */
    public static final Type TYPE_STRATEGY = new Type("strategy");
 
-   /**
-    * Type for a registered Portal RenderSet.
-    */
+   /** Type for a registered Portal RenderSet. */
    public static final Type TYPE_RENDERSET = new Type("renderSet");
 
    /**
@@ -170,9 +161,7 @@
       return new ServerRegistrationID(TYPE_LAYOUT, new String[]{appID, name});
    }
 
-   /**
-    * @return the type of this registration data
-    */
+   /** @return the type of this registration data */
    public Type getType()
    {
       return type;

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeConstants.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 /**
@@ -33,56 +34,45 @@
    {
    }
 
-   /**
-    * Request attribute to propagate the current portal theme in the request
-    */
+   /** Request attribute to propagate the current portal theme in the request */
    public static final String ATTR_THEME = "THEME";
 
-   /**
-    * Request attribute to propagate the theme service
-    */
+   /** Request attribute to propagate the theme service */
    public static final String ATTR_THEMESERVER = "THEMESERVER";
 
-   /**
-    * Request attribute to propagate the rendered markup of the theme
-    */
+   /** Request attribute to propagate the rendered markup of the theme */
    public static final String ATTR_THEMERESULT = "THEMERESULT";
 
    // Portal property keys
 
-   /**
-    * Key name to access the selected layout for the portal or page (via the portal or page properties)
-    */
+   /** Key name to access the selected layout for the portal or page (via the portal or page properties) */
    public static final String PORTAL_PROP_LAYOUT = "layout.id";
 
 
-   /**
-    * Key name to access the selected layout strategy for the portal or page (via the portal or page properties)
-    */
+   /** Key name to access the selected layout strategy for the portal or page (via the portal or page properties) */
    public static final String PORTAL_PROP_STRATEGY = "layout.strategyId";
 
-   /**
-    * Key name to access the selected theme for the portal or page (via the portal or page properties)
-    */
+   /** Key name to access the selected theme for the portal or page (via the portal or page properties) */
    public static final String PORTAL_PROP_THEME = "theme.id";
 
-   /**
-    * Key name to access the selected render set for the portal or page (via the portal or page properties)
-    */
+   /** Key name to access the selected render set for the portal or page (via the portal or page properties) */
    public static final String PORTAL_PROP_RENDERSET = "theme.renderSetId";
 
    /**
-    * Key name to access the selected window renderer for the portal, page, or window (via the portal or page properties)
+    * Key name to access the selected window renderer for the portal, page, or window (via the portal or page
+    * properties)
     */
    public static final String PORTAL_PROP_WINDOW_RENDERER = "theme.windowRendererId";
 
    /**
-    * Key name to access the selected decoration renderer for the portal, page, or window (via the portal or page properties)
+    * Key name to access the selected decoration renderer for the portal, page, or window (via the portal or page
+    * properties)
     */
    public static final String PORTAL_PROP_DECORATION_RENDERER = "theme.decorationRendererId";
 
    /**
-    * Key name to access the selected portlet renderer for the portal, page, or window (via the portal or page properties)
+    * Key name to access the selected portlet renderer for the portal, page, or window (via the portal or page
+    * properties)
     */
    public static final String PORTAL_PROP_PORTLET_RENDERER = "theme.portletRendererId";
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeElement.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeElement.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeElement.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,30 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 /**
- * A generic interface to type all the elements of a theme.
- * <p> Theme elements are the script and link tags that make up the theme. </p>
+ * A generic interface to type all the elements of a theme. <p> Theme elements are the script and link tags that make up
+ * the theme. </p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeException.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,11 +1,34 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme;
 
 import org.jboss.portal.theme.metadata.PortalThemeMetaData;
+import org.jboss.portal.theme.metadata.ThemeLinkMetaData;
 import org.jboss.portal.theme.metadata.ThemeScriptMetaData;
-import org.jboss.portal.theme.metadata.ThemeLinkMetaData;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.ArrayList;
 
 /**
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
@@ -109,9 +132,8 @@
    }
 
    /**
-    * Get all elements of this theme.
-    * <p>Elements of a theme are all the child nodes in the HEAD tag that are part of this theme.
-    * A theme can currently have script and link tags
+    * Get all elements of this theme. <p>Elements of a theme are all the child nodes in the HEAD tag that are part of
+    * this theme. A theme can currently have script and link tags
     *
     * @return a <code>java.util.List</code> of all elements of the theme
     */
@@ -120,9 +142,7 @@
       return elements;
    }
 
-   /**
-    * @see java.lang.Object#toString
-    */
+   /** @see java.lang.Object#toString */
    public String toString()
    {
       return meta.getName();

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeLink.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import org.apache.log4j.Logger;
 
 /**
- * An implementation of a <code>ThemeLink</code>.
- * <p>The theme link is responsible for producing the markup of a link element in the markup response's head tag.</p>
+ * An implementation of a <code>ThemeLink</code>. <p>The theme link is responsible for producing the markup of a link
+ * element in the markup response's head tag.</p>
  *
  * @author Martin Holzner
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -70,33 +71,25 @@
       link = buildLinkMarkup(contextPath, rel, type, href, id, title, media);
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeLink#getLink
-    */
+   /** @see org.jboss.portal.theme.ThemeLink#getLink */
    public String getLink()
    {
       return link;
    }
 
-   /**
-    * @see java.lang.Object#toString
-    */
+   /** @see java.lang.Object#toString */
    public String toString()
    {
       return link;
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeElement#getElement
-    */
+   /** @see org.jboss.portal.theme.ThemeElement#getElement */
    public String getElement()
    {
       return getLink();
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeElement at getAttributeValue
-    */
+   /** @see org.jboss.portal.theme.ThemeElement at getAttributeValue */
    public String getAttributeValue(String attributeName)
    {
       if ("rel".equals(attributeName))

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,9 +1,32 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme;
 
 /**
- * The resulting markup of a theme assembly.
- * <p>A theme consists of zero or more links and scripts that together form the markup to be injected into the
- * head of the page. This result object holds the rendered markup of the theme that can be written into the page.</p>
+ * The resulting markup of a theme assembly. <p>A theme consists of zero or more links and scripts that together form
+ * the markup to be injected into the head of the page. This result object holds the rendered markup of the theme that
+ * can be written into the page.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$
@@ -19,17 +42,13 @@
       this.markup = markup;
    }
 
-   /**
-    * @return the theme markup to inject
-    */
+   /** @return the theme markup to inject */
    public StringBuffer getMarkup()
    {
       return markup;
    }
 
-   /**
-    * @return the name of the theme that produced the markup
-    */
+   /** @return the name of the theme that produced the markup */
    public String getThemeName()
    {
       return themeName;

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeScript.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import org.apache.log4j.Logger;
 
 /**
- * An implementation of a <code>ThemeScript</code>.
- * <p>The script element is responsible for creating the markup that represents a single script tag in the response markup.</p>
+ * An implementation of a <code>ThemeScript</code>. <p>The script element is responsible for creating the markup that
+ * represents a single script tag in the response markup.</p>
  *
  * @author Martin Holzner
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -60,33 +61,25 @@
       script = buildScriptMarkup(contextPath, src, id, type, bodyContent);
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeScript#getScript
-    */
+   /** @see org.jboss.portal.theme.ThemeScript#getScript */
    public String getScript()
    {
       return script;
    }
 
-   /**
-    * @see java.lang.Object#toString()
-    */
+   /** @see java.lang.Object#toString() */
    public String toString()
    {
       return script;
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeElement#getElement
-    */
+   /** @see org.jboss.portal.theme.ThemeElement#getElement */
    public String getElement()
    {
       return getScript();
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeElement at getAttributeValue
-    */
+   /** @see org.jboss.portal.theme.ThemeElement at getAttributeValue */
    public String getAttributeValue(String attributeName)
    {
       if ("type".equals(attributeName))

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,32 +1,33 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme;
 
 import org.jboss.portal.theme.metadata.PortalThemeMetaData;
 
 /**
- * The ThemeService is the location where all the available themes are stored and retrieved.
- * <p>The theme server works together with a deployer to register and unregister themes. The portal can access the
- * theme server via the server manager, and query it for available themes.</P>
+ * The ThemeService is the location where all the available themes are stored and retrieved. <p>The theme server works
+ * together with a deployer to register and unregister themes. The portal can access the theme server via the server
+ * manager, and query it for available themes.</P>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>
@@ -57,14 +58,15 @@
    void removeTheme(PortalTheme theme) throws ThemeException;
 
    /**
-    * Remove all themes that are registered with the provided application.
-    * <p>On deployment of a new application, the theme descriptor (if any present) in that application is parsed for
-    * themes that are to be registered with the theme server. For each entry in the descriptor, a new theme is registered
-    * with the theme server. Uppon undeployment of that same application, all themes must be deregistered. This method
-    * is a convenient way to achieve this.
+    * Remove all themes that are registered with the provided application. <p>On deployment of a new application, the
+    * theme descriptor (if any present) in that application is parsed for themes that are to be registered with the
+    * theme server. For each entry in the descriptor, a new theme is registered with the theme server. Uppon
+    * undeployment of that same application, all themes must be deregistered. This method is a convenient way to achieve
+    * this.
     *
     * @param applicationName the name of the application that hosts the themes to unregister
-    * @throws ThemeException if there are no themes registered with this application, or if an error occurs during the remove
+    * @throws ThemeException if there are no themes registered with this application, or if an error occurs during the
+    *                        remove
     */
    void removeThemes(String applicationName) throws ThemeException;
 }

Modified: trunk/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/ThemeServiceInfo.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme;
 
 import java.util.Collection;

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.apache.log4j.Logger;
@@ -42,10 +43,10 @@
 import java.util.List;
 
 /**
- * Deploy the layouts contained in a WebApplication.
- * <p>A Web Application can define layouts to be offered to the portal. Layouts are JSPs or Servlets, that
- * take over the job of presenting the rendered content of a portal request to the end device. Layouts need to be
- * announced to the portal via the /WEB-INF/portal-layouts.xml descriptor (see also portal-layouts.dtd)</p>
+ * Deploy the layouts contained in a WebApplication. <p>A Web Application can define layouts to be offered to the
+ * portal. Layouts are JSPs or Servlets, that take over the job of presenting the rendered content of a portal request
+ * to the end device. Layouts need to be announced to the portal via the /WEB-INF/portal-layouts.xml descriptor (see
+ * also portal-layouts.dtd)</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;
@@ -39,12 +40,11 @@
 import java.util.List;
 
 /**
- * Deploy layout strategies and rendersets contained in a WebApplication.
- * <p>A Web Application can define layout strategies and render sets in their respective descriptors.
- * Portal RenderSets are defined in a descriptor called portal-renderSet.xml in the WEB-INF/layout folder.
- * Layout strategies are defined in a descriptor called portal-strategies.xml in the same folder.
- * Additionally, rendersets and layout strategies can be defined as part of a layout descriptor (portal-layouts.xml).
- * Those cases are handled by the layout deployment.</p>
+ * Deploy layout strategies and rendersets contained in a WebApplication. <p>A Web Application can define layout
+ * strategies and render sets in their respective descriptors. Portal RenderSets are defined in a descriptor called
+ * portal-renderSet.xml in the WEB-INF/layout folder. Layout strategies are defined in a descriptor called
+ * portal-strategies.xml in the same folder. Additionally, rendersets and layout strategies can be defined as part of a
+ * layout descriptor (portal-layouts.xml). Those cases are handled by the layout deployment.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutFeaturesDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/LayoutStategyMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
+import org.jboss.portal.common.MediaType;
+import org.jboss.portal.theme.metadata.LayoutStrategyMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.portal.theme.metadata.LayoutStrategyMetaData;
-import org.jboss.portal.common.MediaType;
 import org.xml.sax.Attributes;
 
 import javax.activation.MimeTypeParseException;

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalLayoutMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
+import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
+import org.jboss.portal.theme.metadata.StateURIMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
-import org.jboss.portal.theme.metadata.StateURIMetaData;
 import org.xml.sax.Attributes;
 
 import java.util.ArrayList;

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/PortalThemeMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,32 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
+import org.jboss.portal.theme.metadata.PortalThemeMetaData;
+import org.jboss.portal.theme.metadata.ThemeLinkMetaData;
+import org.jboss.portal.theme.metadata.ThemeScriptMetaData;
 import org.jboss.xb.binding.ObjectModelFactory;
 import org.jboss.xb.binding.UnmarshallingContext;
-import org.jboss.portal.theme.metadata.PortalThemeMetaData;
-import org.jboss.portal.theme.metadata.ThemeScriptMetaData;
-import org.jboss.portal.theme.metadata.ThemeLinkMetaData;
 import org.xml.sax.Attributes;
 
 import java.util.ArrayList;

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/RenderSetMetaDataFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.jboss.portal.common.MediaType;
@@ -50,7 +51,7 @@
 
    public Object newChild(ArrayList list, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
    {
-      if("renderSet".equals(localName))
+      if ("renderSet".equals(localName))
       {
          String name = attrs.getValue("name");
          RenderSetMetaData renderSet = new RenderSetMetaData();
@@ -67,7 +68,7 @@
 
    public Object newChild(RenderSetMetaData renderSet, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) throws MimeTypeParseException
    {
-      if("set".equals(localName))
+      if ("set".equals(localName))
       {
          RendererSetMetaData rendererSet = new RendererSetMetaData();
          String contentType = attrs.getValue("content-type");
@@ -84,23 +85,23 @@
 
    public void setValue(RendererSetMetaData rendererSet, UnmarshallingContext nav, String nsURI, String localName, String value)
    {
-      if("region-renderer".equals(localName))
+      if ("region-renderer".equals(localName))
       {
          rendererSet.setRegionRenderer(value);
       }
-      else if("window-renderer".equals(localName))
+      else if ("window-renderer".equals(localName))
       {
          rendererSet.setWindowRenderer(value);
       }
-      else if("portlet-renderer".equals(localName))
+      else if ("portlet-renderer".equals(localName))
       {
          rendererSet.setPortletRenderer(value);
       }
-      else if("decoration-renderer".equals(localName))
+      else if ("decoration-renderer".equals(localName))
       {
          rendererSet.setDecorationRenderer(value);
       }
-      else if(localName.equals("ajax-enabled"))
+      else if (localName.equals("ajax-enabled"))
       {
          rendererSet.setAjaxEnabled(value.equals("true"));
       }

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeployment.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.apache.log4j.Logger;
@@ -26,8 +27,8 @@
 import org.jboss.portal.common.util.Tools;
 import org.jboss.portal.server.deployment.PortalWebApp;
 import org.jboss.portal.server.deployment.jboss.Deployment;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ThemeException;
-import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.metadata.PortalThemeMetaData;
 import org.jboss.xb.binding.UnmarshallerFactory;
 
@@ -38,9 +39,9 @@
 import java.util.List;
 
 /**
- * Deploy the themes contained in a WebApplication.
- * <p>This deployer scans the archive for /WEB-INF/portal-themes.xml. This file contains the
- * definition of one or more themes. A theme is one, or a set of, css file, and the resources that go with it.</p>
+ * Deploy the themes contained in a WebApplication. <p>This deployer scans the archive for /WEB-INF/portal-themes.xml.
+ * This file contains the definition of one or more themes. A theme is one, or a set of, css file, and the resources
+ * that go with it.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/deployment/jboss/ThemeDeploymentFactory.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.deployment.jboss;
 
 import org.jboss.deployment.DeploymentException;

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/JSPLayout.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme.impl;
 
 import org.jboss.portal.server.ServerInvocation;
@@ -20,9 +43,7 @@
  */
 public final class JSPLayout extends PortalLayout
 {
-   /**
-    * @see PortalLayout#assembleResponse(org.jboss.portal.server.ServerInvocation,org.jboss.portal.theme.render.MarkupResult)
-    */
+   /** @see PortalLayout#assembleResponse(org.jboss.portal.server.ServerInvocation,org.jboss.portal.theme.render.MarkupResult) */
    public void assembleResponse(ServerInvocation invocation, MarkupResult markupResult)
       throws ServletException, IOException
    {

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/LayoutServiceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,44 +1,45 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl;
 
 import org.apache.log4j.Logger;
 import org.jboss.portal.common.MediaType;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.server.util.HTTPStreamInfo;
 import org.jboss.portal.theme.LayoutException;
 import org.jboss.portal.theme.LayoutInfo;
 import org.jboss.portal.theme.LayoutService;
 import org.jboss.portal.theme.PortalLayout;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ServerRegistrationID;
 import org.jboss.portal.theme.ThemeConstants;
-import org.jboss.portal.theme.RuntimeContext;
-import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 import org.jboss.portal.theme.metadata.LayoutStrategyMetaData;
-import org.jboss.portal.theme.metadata.RendererSetMetaData;
+import org.jboss.portal.theme.metadata.PortalLayoutMetaData;
 import org.jboss.portal.theme.metadata.RenderSetMetaData;
+import org.jboss.portal.theme.metadata.RendererSetMetaData;
 import org.jboss.portal.theme.render.MarkupResult;
 import org.jboss.portal.theme.render.PortalRenderSet;
 import org.jboss.portal.theme.strategy.LayoutStrategy;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.system.Service;
 
 import java.util.ArrayList;
@@ -50,11 +51,11 @@
 import java.util.Map;
 
 /**
- * Implementaion of the layout server.
- * <p>The layout server is a registry of all available layouts. The server also allows access to all available render sets
- * and layout strategies. Render sets and layout strategies can be independent (named), or children of a layout.
- * Accordingly, the layout server provides accessor methods to get strategies and render set by name, or by layout.
- * Render sets and layout strategies can, and must, be defined for a specific media type (mime type).</p>
+ * Implementaion of the layout server. <p>The layout server is a registry of all available layouts. The server also
+ * allows access to all available render sets and layout strategies. Render sets and layout strategies can be
+ * independent (named), or children of a layout. Accordingly, the layout server provides accessor methods to get
+ * strategies and render set by name, or by layout. Render sets and layout strategies can, and must, be defined for a
+ * specific media type (mime type).</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>
@@ -92,9 +93,7 @@
       log.debug("LayoutServiceImpl instantiated.");
    }
 
-   /**
-    * @see org.jboss.system.Service#create()
-    */
+   /** @see org.jboss.system.Service#create() */
    protected void createService() throws Exception
    {
       log.debug("create LayoutServiceImpl ....");
@@ -109,9 +108,7 @@
       exactRenderSetNames = Collections.synchronizedMap(new HashMap());
    }
 
-   /**
-    * @see org.jboss.system.Service#destroy()
-    */
+   /** @see org.jboss.system.Service#destroy() */
    protected void destroyService()
    {
       log.debug("destroy LayoutServiceImpl ....");
@@ -124,17 +121,13 @@
       exactRenderSetNames.clear();
    }
 
-   /**
-    * @see org.jboss.system.Service#start()
-    */
+   /** @see org.jboss.system.Service#start() */
    protected void startService() throws Exception
    {
       log.debug("start LayoutServiceImpl ....");
    }
 
-   /**
-    * @see org.jboss.system.Service#stop()
-    */
+   /** @see org.jboss.system.Service#stop() */
    protected void stopService()
    {
       log.debug("stop LayoutServiceImpl ....");
@@ -173,9 +166,7 @@
       }
    }
 
-   /**
-    * @see LayoutService#setDefaultLayout(String)
-    */
+   /** @see LayoutService#setDefaultLayout(String) */
    public void setDefaultLayout(String name) throws LayoutException
    {
       log.debug("setting default: " + name);
@@ -194,9 +185,7 @@
       }
    }
 
-   /**
-    * @see LayoutService#getLayout(org.jboss.portal.theme.ServerRegistrationID, boolean)
-    */
+   /** @see LayoutService#getLayout(org.jboss.portal.theme.ServerRegistrationID,boolean) */
    public PortalLayout getLayout(ServerRegistrationID id, boolean defaultOnNull)
    {
       log.debug("get " + id + "...");
@@ -212,9 +201,7 @@
       return (PortalLayout)layouts.get(id);
    }
 
-   /**
-    * @see LayoutService#getLayout(String, boolean)
-    */
+   /** @see LayoutService#getLayout(String,boolean) */
    public PortalLayout getLayout(String name, boolean defaultOnNull)
    {
       log.debug("get " + name + "...");
@@ -302,9 +289,7 @@
       }
    }
 
-   /**
-    * @see LayoutService#removeLayouts(String)
-    */
+   /** @see LayoutService#removeLayouts(String) */
    public void removeLayouts(String appID) throws LayoutException
    {
       List layoutsToDelete = new ArrayList();
@@ -354,9 +339,7 @@
       }
    }
 
-   /**
-    * @see LayoutService#getStrategy(String, org.jboss.portal.common.MediaType)
-    */
+   /** @see LayoutService#getStrategy(String,org.jboss.portal.common.MediaType) */
    public LayoutStrategy getStrategy(String strategyName, MediaType mediaType)
    {
       ServerRegistrationID id;
@@ -380,9 +363,7 @@
       return null;
    }
 
-   /**
-    * @see LayoutService#removeStrategies(String)
-    */
+   /** @see LayoutService#removeStrategies(String) */
    public void removeStrategies(String appId) throws LayoutException
    {
       log.debug("removing named strategies for : " + appId);
@@ -436,9 +417,7 @@
       }
    }
 
-   /**
-    * @see LayoutService#getRenderSet(String, org.jboss.portal.common.MediaType)
-    */
+   /** @see LayoutService#getRenderSet(String,org.jboss.portal.common.MediaType) */
    public PortalRenderSet getRenderSet(String renderSetName, MediaType mediaType)
    {
       ServerRegistrationID id;
@@ -462,9 +441,7 @@
       return null;
    }
 
-   /**
-    * @see LayoutService#removeRenderSets(String)
-    */
+   /** @see LayoutService#removeRenderSets(String) */
    public void removeRenderSets(String appId) throws LayoutException
    {
       log.debug("removing named render sets for : " + appId);
@@ -494,35 +471,29 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.theme.LayoutService#getLayouts()
-    */
+   /** @see org.jboss.portal.theme.LayoutService#getLayouts() */
    public Collection getLayouts()
    {
       return Collections.unmodifiableCollection(layouts.values());
    }
 
-   /**
-    * @see org.jboss.portal.theme.LayoutService#getStrategies()
-    */
+   /** @see org.jboss.portal.theme.LayoutService#getStrategies() */
    public Collection getStrategies()
    {
       return Collections.unmodifiableCollection((strategyNames.values()));
    }
 
-   /**
-    * @see org.jboss.portal.theme.LayoutService#getRenderSets()
-    */
+   /** @see org.jboss.portal.theme.LayoutService#getRenderSets() */
    public Collection getRenderSets()
    {
       return Collections.unmodifiableCollection((renderSetNames.values()));
    }
 
    /**
-    * Get the PortalRenderSet to use for the provided layout, page and media type.
-    * <p>The render set can be defined specifically for a layout, a page, or a portal. The one defined for the layout overwrites
-    * the one defined for the page, which in turn overwrites the one defined for the portal. The render set is defined for a
-    * specific content type (media type), which will be determined from the provided HttpStreamInfo.</p>
+    * Get the PortalRenderSet to use for the provided layout, page and media type. <p>The render set can be defined
+    * specifically for a layout, a page, or a portal. The one defined for the layout overwrites the one defined for the
+    * page, which in turn overwrites the one defined for the portal. The render set is defined for a specific content
+    * type (media type), which will be determined from the provided HttpStreamInfo.</p>
     *
     * @param info
     * @param result
@@ -544,8 +515,8 @@
    }
 
    /**
-    * Get the render set property from the provided properties (if one is present), and then get the render set for
-    * that property and media type from the layout service.
+    * Get the render set property from the provided properties (if one is present), and then get the render set for that
+    * property and media type from the layout service.
     *
     * @param contentType
     * @param properties

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/ThemeServiceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl;
 
 import org.apache.log4j.Logger;
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.theme.PortalTheme;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ServerRegistrationID;
 import org.jboss.portal.theme.ThemeException;
 import org.jboss.portal.theme.ThemeInfo;
 import org.jboss.portal.theme.ThemeService;
-import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.metadata.PortalThemeMetaData;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.system.Service;
 
 import java.util.ArrayList;
@@ -61,9 +62,7 @@
       log.debug("ThemeServiceImpl instantiated.");
    }
 
-   /**
-    * @throws Exception
-    */
+   /** @throws Exception  */
    protected void createService() throws Exception
    {
       log.debug("create ThemeServiceImpl ....");
@@ -134,9 +133,7 @@
       }
    }
 
-   /**
-    * @see ThemeService#removeTheme(org.jboss.portal.theme.PortalTheme)
-    */
+   /** @see ThemeService#removeTheme(org.jboss.portal.theme.PortalTheme) */
    public void removeTheme(PortalTheme theme)
    {
       ServerRegistrationID themeId = theme.getThemeInfo().getRegistrationId();
@@ -178,9 +175,7 @@
       }
    }
 
-   /**
-    * @see ThemeService#removeThemes(String)
-    */
+   /** @see ThemeService#removeThemes(String) */
    public void removeThemes(String appId)
    {
       List themesToDelete = new ArrayList();
@@ -203,9 +198,7 @@
       }
    }
 
-   /**
-    * @see ThemeService#setDefault(org.jboss.portal.theme.ServerRegistrationID)
-    */
+   /** @see ThemeService#setDefault(org.jboss.portal.theme.ServerRegistrationID) */
    public void setDefault(ServerRegistrationID themeId) throws ThemeException
    {
       log.debug("set default theme " + themeId);
@@ -240,9 +233,7 @@
       throw new ThemeException("Theme with name [" + name + "] does not exist");
    }
 
-   /**
-    * @see ThemeService#getTheme(org.jboss.portal.theme.ServerRegistrationID, boolean)
-    */
+   /** @see ThemeService#getTheme(org.jboss.portal.theme.ServerRegistrationID,boolean) */
    public PortalTheme getTheme(ServerRegistrationID themeId, boolean defaultOnNull)
    {
       log.debug("get theme " + themeId);
@@ -259,9 +250,7 @@
       return (PortalTheme)themes.get(themeId);
    }
 
-   /**
-    * @see ThemeService#getTheme(String, boolean)
-    */
+   /** @see ThemeService#getTheme(String,boolean) */
    public PortalTheme getTheme(String name, boolean defaultOnNull)
    {
       log.debug("get theme " + name);
@@ -291,17 +280,13 @@
       return null;
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeService#getThemes()
-    */
+   /** @see org.jboss.portal.theme.ThemeService#getThemes() */
    public Collection getThemes()
    {
       return Collections.unmodifiableCollection(themes.values());
    }
 
-   /**
-    * @see org.jboss.portal.theme.ThemeService#getThemeNames()
-    */
+   /** @see org.jboss.portal.theme.ThemeService#getThemeNames() */
    public Collection getThemeNames()
    {
       return Collections.unmodifiableCollection(themeNames.keySet());

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/WARTheme.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme.impl;
 
 import org.jboss.portal.server.ServerRequest;
@@ -20,9 +43,7 @@
  */
 public final class WARTheme extends PortalTheme
 {
-   /**
-    * @ see PortalTheme#assembleResponse(ServerRequest, ServerResponse)
-    */
+   /** @ see PortalTheme#assembleResponse(ServerRequest, ServerResponse) */
    public ThemeResult assembleResponse(ServerRequest request, ServerResponse response)
    {
       StringWriter out = new StringWriter();
@@ -38,9 +59,7 @@
       return new ThemeResult(getThemeInfo().getName(), markup);
    }
 
-   /**
-    * @ see PortalTheme#assembleResponse(Writer)
-    */
+   /** @ see PortalTheme#assembleResponse(Writer) */
    public void assembleResponse(Writer writer)
    {
       PrintWriter buffer = new PrintWriter(writer);

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/page/PageServiceImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.page;
 
+import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.theme.LayoutService;
 import org.jboss.portal.theme.ThemeService;
 import org.jboss.portal.theme.page.PageService;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
 
 /**
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
@@ -36,9 +37,7 @@
    private ThemeService themeService;
 //   private InterceptorStack pageStack;
 
-   /**
-    * Inject the layout service (must be defined as a dependent service in service descriptor).
-    */
+   /** Inject the layout service (must be defined as a dependent service in service descriptor). */
    public void setLayoutService(LayoutService layoutService)
    {
       this.layoutService = layoutService;
@@ -49,9 +48,7 @@
       return layoutService;
    }
 
-   /**
-    * Inject the theme service (must be defined as a dependent service in service descriptor).
-    */
+   /** Inject the theme service (must be defined as a dependent service in service descriptor). */
    public void setThemeService(ThemeService themeService)
    {
       this.themeService = themeService;

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.div;
 
 import org.apache.log4j.Logger;
@@ -50,23 +51,17 @@
 {
    private static Logger log = Logger.getLogger(DivDecorationRenderer.class);
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
    }
 
-   /**
-    * @see DecorationRenderer#render
-    */
+   /** @see DecorationRenderer#render */
    public void render(RenderContext renderContext, WindowContext portletContext, WindowResult result)
       throws RenderException
    {

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivPortletRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.div;
 
 import org.jboss.portal.theme.page.WindowContext;
@@ -37,9 +38,7 @@
 public class DivPortletRenderer
    implements PortletRenderer
 {
-   /**
-    * @see PortletRenderer#render
-    */
+   /** @see PortletRenderer#render */
    public void render(RenderContext renderContext, WindowContext state, WindowResult result)
       throws RenderException
    {
@@ -48,18 +47,14 @@
       renderEnd(renderContext);
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
       ctx.getMarkupFragment().append("<tr><td class=\"portlet-content-left\"></td>");
       ctx.getMarkupFragment().append("<td class=\"portlet-body\"><div class=\"portlet-content-center\">");
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
       ctx.getMarkupFragment().append("</div></td><td class=\"portlet-content-right\"></td></tr>");

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivRegionRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.div;
 
 import org.jboss.logging.Logger;
@@ -29,7 +30,6 @@
 import org.jboss.portal.theme.render.RenderContext;
 import org.jboss.portal.theme.render.RenderException;
 
-import java.lang.reflect.Method;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -42,40 +42,38 @@
  * @see org.jboss.portal.theme.render.RegionRenderer
  */
 public class DivRegionRenderer
-      implements RegionRenderer
+   implements RegionRenderer
 {
    private static Logger log = Logger.getLogger(DivRegionRenderer.class);
 
-   /**
-    * @see RegionRenderer#render
-    */
+   /** @see RegionRenderer#render */
    public void render(RenderContext renderContext, Region region, Map portletContexts, Map windowResults) throws RenderException
    {
       StringBuffer markup = renderContext.getMarkupFragment();
       markup.append("<div");
 
-      if(region == null) // || region.getWindows().size() <= 0)
+      if (region == null) // || region.getWindows().size() <= 0)
       {
          markup.append(" class='empty-region' />");
          return;
       }
       else
       {
-         if(renderContext.getRegionID() != null)
+         if (renderContext.getRegionID() != null)
          {
             markup.append(" id='").append(renderContext.getRegionID()).append("'>");
          }
       }
 
       //
-      for(Iterator i = region.getWindows().iterator(); i.hasNext();)
+      for (Iterator i = region.getWindows().iterator(); i.hasNext();)
       {
-         WindowContext window = (WindowContext) i.next();
-         WindowContext portletContext = (WindowContext) portletContexts.get(window.getId());
-         WindowResult result = (WindowResult) windowResults.get(window.getId());
+         WindowContext window = (WindowContext)i.next();
+         WindowContext portletContext = (WindowContext)portletContexts.get(window.getId());
+         WindowResult result = (WindowResult)windowResults.get(window.getId());
 
          // The result may be null if it has not been added to the page for some reason
-         if(result != null)
+         if (result != null)
          {
             renderContext.getWindowRenderer(result).render(renderContext, portletContext, result);
          }
@@ -83,16 +81,12 @@
       markup.append("</div>");
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext) */
    public void renderStart(RenderContext ctx)
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */
    public void renderEnd(RenderContext ctx)
    {
    }

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivWindowRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.div;
 
 import org.apache.log4j.Logger;
@@ -43,9 +44,7 @@
 {
    private static Logger log = Logger.getLogger(DivWindowRenderer.class);
 
-   /**
-    * @see WindowRenderer#render
-    */
+   /** @see WindowRenderer#render */
    public void render(RenderContext renderContext, WindowContext portletContext, WindowResult result) throws RenderException
    {
       renderStart(renderContext);
@@ -84,18 +83,14 @@
       renderEnd(renderContext);
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext) */
    public void renderStart(RenderContext ctx)
    {
       ctx.getMarkupFragment().append("<div class=\"portlet-container\">");
       ctx.getMarkupFragment().append("<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">");
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */
    public void renderEnd(RenderContext ctx)
    {
       ctx.getMarkupFragment().append("</table></div>");

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaDecorationRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.theme.impl.render.dynamic;
 
@@ -60,25 +61,19 @@
       delegate = decorationRenderer;
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
       delegate.renderStart(ctx);
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
       delegate.renderEnd(ctx);
    }
 
-   /**
-    * @see DecorationRenderer#render
-    */
+   /** @see DecorationRenderer#render */
    public void render(RenderContext renderContext, WindowContext windowContext, WindowResult result) throws RenderException
    {
       if (DynaRegionRenderer.isEnabled())

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaPortletRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,28 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.theme.impl.render.dynamic;
 
-import org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer;
 import org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer;
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
@@ -44,20 +44,18 @@
    private PortletRenderer delegate;
 
    public DynaPortletRenderer(PortletRenderer portletRenderer) throws InstantiationException,
-                                                                      IllegalAccessException, ClassNotFoundException
+      IllegalAccessException, ClassNotFoundException
    {
       super();
       delegate = portletRenderer;
    }
 
-   /**
-    * @see PortletRenderer#render
-    */
+   /** @see PortletRenderer#render */
    public void render(RenderContext renderContext, WindowContext state, WindowResult result) throws RenderException
    {
       if (DynaRegionRenderer.isEnabled())
       {
-         if(delegate instanceof EmptyPortletRenderer)
+         if (delegate instanceof EmptyPortletRenderer)
          {
             renderContext.getMarkupFragment().append("<span class=\"handle\">");
             delegate.render(renderContext, state, result);
@@ -74,17 +72,13 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
       delegate.renderStart(ctx);
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
       delegate.renderEnd(ctx);

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaRegionRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,33 +1,34 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.theme.impl.render.dynamic;
 
 import org.jboss.logging.Logger;
+import org.jboss.portal.theme.ThemeConstants;
 import org.jboss.portal.theme.page.Region;
 import org.jboss.portal.theme.render.RegionRenderer;
 import org.jboss.portal.theme.render.RenderContext;
 import org.jboss.portal.theme.render.RenderException;
-import org.jboss.portal.theme.ThemeConstants;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -63,9 +64,7 @@
       delegate = regionRenderer;
    }
 
-   /**
-    * @see RegionRenderer#render
-    */
+   /** @see RegionRenderer#render */
    public void render(RenderContext renderContext, Region region,
                       Map portletContexts, Map windowResults) throws RenderException
    {
@@ -243,17 +242,13 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext) */
    public void renderStart(RenderContext ctx)
    {
       delegate.renderStart(ctx);
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */
    public void renderEnd(RenderContext ctx)
    {
       delegate.renderEnd(ctx);

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/dynamic/DynaWindowRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.theme.impl.render.dynamic;
 
@@ -44,25 +45,23 @@
    private WindowRenderer delegate;
 
    public DynaWindowRenderer(WindowRenderer windowRenderer) throws InstantiationException,
-                                                                   IllegalAccessException, ClassNotFoundException
+      IllegalAccessException, ClassNotFoundException
    {
       super();
       delegate = windowRenderer;
    }
 
-   /**
-    * @see WindowRenderer#render
-    */
+   /** @see WindowRenderer#render */
    public void render(RenderContext renderContext, WindowContext portletContext, WindowResult result) throws RenderException
    {
       if (DynaRegionRenderer.isEnabled())
       {
-         int portletNumber = ((DynaRegionRenderer) renderContext
-               .getRegionRenderer()).getPortletNumber(renderContext
-               .getRegionID());
+         int portletNumber = ((DynaRegionRenderer)renderContext
+            .getRegionRenderer()).getPortletNumber(renderContext
+            .getRegionID());
 
-         ((DynaRegionRenderer) renderContext.getRegionRenderer()).setWindowId(
-               "portlet-dnd-" + renderContext.getRegionID() + "-"
+         ((DynaRegionRenderer)renderContext.getRegionRenderer()).setWindowId(
+            "portlet-dnd-" + renderContext.getRegionID() + "-"
                + portletNumber, portletContext.getWindowName());
 
          renderContext.getMarkupFragment().append("<div id=\"").append(portletContext.getId()).append("\">\n");
@@ -77,17 +76,13 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart(org.jboss.portal.theme.render.RenderContext) */
    public void renderStart(RenderContext ctx)
    {
       delegate.renderStart(ctx);
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext)
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd(org.jboss.portal.theme.render.RenderContext) */
    public void renderEnd(RenderContext ctx)
    {
       delegate.renderEnd(ctx);

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyDecorationRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.empty;
 
 import org.jboss.portal.theme.page.WindowContext;
@@ -37,24 +38,18 @@
 public class EmptyDecorationRenderer
    implements DecorationRenderer
 {
-   /**
-    * @see DecorationRenderer#render
-    */
+   /** @see DecorationRenderer#render */
    public void render(RenderContext renderContext, WindowContext state, WindowResult result)
       throws RenderException
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
    }

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyPortletRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.empty;
 
 import org.apache.log4j.Logger;
@@ -40,9 +41,7 @@
 {
    private static Logger log = Logger.getLogger(EmptyPortletRenderer.class);
 
-   /**
-    * @see PortletRenderer#render
-    */
+   /** @see PortletRenderer#render */
    public void render(RenderContext renderContext, WindowContext state, WindowResult result)
       throws RenderException
    {
@@ -50,16 +49,12 @@
       renderContext.getMarkupFragment().append(result.getContent());
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
    }

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyRegionRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.empty;
 
 import org.apache.log4j.Logger;
@@ -34,8 +35,8 @@
 import java.util.TreeMap;
 
 /**
- * Implementation of a Region renderer that creates no markup, and only passes control to the
- * Portlet renderer of the render set provided by the render context.
+ * Implementation of a Region renderer that creates no markup, and only passes control to the Portlet renderer of the
+ * render set provided by the render context.
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -46,9 +47,7 @@
 {
    private static Logger log = Logger.getLogger(EmptyRegionRenderer.class);
 
-   /**
-    * @see RegionRenderer#render
-    */
+   /** @see RegionRenderer#render */
    public void render(RenderContext renderContext, Region region, Map portletContexts, Map windowResults) throws RenderException
    {
       log.debug("render portlets in region : " + region.getId());
@@ -73,16 +72,12 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext renderContext)
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext renderContext)
    {
    }

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/empty/EmptyWindowRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.render.empty;
 
 import org.jboss.portal.WindowState;
@@ -29,8 +30,7 @@
 import org.jboss.portal.theme.render.WindowRenderer;
 
 /**
- * Implementation of a Window renderer that creates no markup, and only passed control to the
- * Portlet renderer.
+ * Implementation of a Window renderer that creates no markup, and only passed control to the Portlet renderer.
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -41,9 +41,7 @@
 {
 //   private static Logger log = Logger.getLogger(EmptyWindowRenderer.class);
 
-   /**
-    * @see WindowRenderer#render
-    */
+   /** @see WindowRenderer#render */
    public void render(RenderContext renderContext, WindowContext portletContext, WindowResult result) throws RenderException
    {
 //      log.debug("render window for portlet : " + portletContext.);
@@ -64,16 +62,12 @@
 //      }
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderStart
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderStart */
    public void renderStart(RenderContext ctx)
    {
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.Renderer#renderEnd
-    */
+   /** @see org.jboss.portal.theme.render.Renderer#renderEnd */
    public void renderEnd(RenderContext ctx)
    {
    }

Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/strategy/MaximizingStrategyImpl.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.impl.strategy;
 
 import org.apache.log4j.Logger;
@@ -42,9 +43,7 @@
 public class MaximizingStrategyImpl extends LayoutStrategy
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static Logger log = Logger.getLogger(MaximizingStrategyImpl.class);
 
    public MaximizingStrategyImpl()

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutRegistrationMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import org.jboss.portal.theme.ServerRegistrationID;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/LayoutStrategyMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import org.jboss.portal.common.MediaType;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalLayoutMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 
@@ -32,26 +33,10 @@
  * <p/>
  * here is an example for a layout descriptor:
  * <p/>
- * <layouts>
- * <layout>
- * <name>nodesk</name>
- * <uri>/nodesk/index.jsp</uri>
- * <regions>
- * <region name="left"/>
- * <region name="center"/>
- * </regions>
- * </layout>
- * <layout>
- * <name>generic</name>
- * <uri>/layouts/generic/index.jsp</uri>
- * <uri state="maximized">/layouts/generic/maximized.jsp</uri>
- * <regions>
- * <region name="left"/>
- * <region name="center"/>
- * <region name="navigation"/>
- * </regions>
- * </layout>
- * </layouts>
+ * <layouts> <layout> <name>nodesk</name> <uri>/nodesk/index.jsp</uri> <regions> <region name="left"/> <region
+ * name="center"/> </regions> </layout> <layout> <name>generic</name> <uri>/layouts/generic/index.jsp</uri> <uri
+ * state="maximized">/layouts/generic/maximized.jsp</uri> <regions> <region name="left"/> <region name="center"/>
+ * <region name="navigation"/> </regions> </layout> </layouts>
  * <p/>
  * </p>
  *
@@ -74,9 +59,7 @@
       this.stateURIMap = new HashMap();
    }
 
-   /**
-    * @return the name of this layout
-    */
+   /** @return the name of this layout */
    public String getName()
    {
       return name;
@@ -87,9 +70,7 @@
       this.name = name;
    }
 
-   /**
-    * @return the URI for this layout as defined in the descriptor (this is the uri without a state attribute)
-    */
+   /** @return the URI for this layout as defined in the descriptor (this is the uri without a state attribute) */
    public String getURI()
    {
       return uri;
@@ -100,25 +81,19 @@
       this.uri = URI;
    }
 
-   /**
-    * @return a map of layout URIs (String) keyed by layout state (String) as defined in the layout descriptor
-    */
+   /** @return a map of layout URIs (String) keyed by layout state (String) as defined in the layout descriptor */
    public Map getLayoutURIStateMap()
    {
       return stateURIMap;
    }
 
-   /**
-    * @return a list of the region names (of type String) of this layout as defined in the layout meta data
-    */
+   /** @return a list of the region names (of type String) of this layout as defined in the layout meta data */
    public List getRegionNames()
    {
       return regionNames;
    }
 
-   /**
-    * @return the class name of the layout implementation to use
-    */
+   /** @return the class name of the layout implementation to use */
    public String getClassName()
    {
       return className;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/PortalThemeMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import java.util.ArrayList;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/RenderSetMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
- * Meta data describing a set of render sets, one set per content type.
- * <p>A render set contains 4 implementation classes for the 4 renderer types that define a render set. A render set
- * has a name, and can have several sets (of 4) renderers, one per content type.
- * </p>
+ * Meta data describing a set of render sets, one set per content type. <p>A render set contains 4 implementation
+ * classes for the 4 renderer types that define a render set. A render set has a name, and can have several sets (of 4)
+ * renderers, one per content type. </p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$
@@ -59,9 +58,7 @@
       this.name = name;
    }
 
-   /**
-    * @return a List of RenderSetSetMetaData
-    */
+   /** @return a List of RenderSetSetMetaData */
    public List getRendererSet()
    {
       return rendererSet;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/RendererSetMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import org.jboss.portal.common.MediaType;
@@ -28,26 +29,17 @@
  * <p/>
  * exmaple of a render set descriptor:
  * <p/>
- * <portal-renderSet>
- * <renderSet name="divRenderer">
- * <ajax enabled="true"/>
- * <set content-type="text/html">
+ * <portal-renderSet> <renderSet name="divRenderer"> <ajax enabled="true"/> <set content-type="text/html">
  * <region-renderer>org.jboss.portal.theme.impl.render.div.DivRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.div.DivWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.div.DivPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * <renderSet name="emptyRenderer">
- * <ajax enabled="true"/>
- * <set content-type="text/html">
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.div.DivDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> <renderSet name="emptyRenderer"> <ajax enabled="true"/> <set content-type="text/html">
  * <region-renderer>org.jboss.portal.theme.impl.render.empty.EmptyRegionRenderer</region-renderer>
  * <window-renderer>org.jboss.portal.theme.impl.render.empty.EmptyWindowRenderer</window-renderer>
  * <portlet-renderer>org.jboss.portal.theme.impl.render.empty.EmptyPortletRenderer</portlet-renderer>
- * <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer>
- * </set>
- * </renderSet>
- * </portal-renderSet>
+ * <decoration-renderer>org.jboss.portal.theme.impl.render.empty.EmptyDecorationRenderer</decoration-renderer> </set>
+ * </renderSet> </portal-renderSet>
  * <p/>
  * </p>
  *

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/ServerRegistrationMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import org.jboss.portal.theme.ServerRegistrationID;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/StateURIMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeLinkMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
-/**
- * @author Martin Holzner
- */
+/** @author Martin Holzner */
 public final class ThemeLinkMetaData
 {
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeRegistrationMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
 import org.jboss.portal.theme.ServerRegistrationID;

Modified: trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/metadata/ThemeScriptMetaData.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,29 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.metadata;
 
-/**
- * @author Martin Holzner
- */
+/** @author Martin Holzner */
 public final class ThemeScriptMetaData
 {
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/navigation/PageNavigationalState.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme.navigation;
 
 import org.jboss.portal.theme.page.WindowContext;
@@ -2,7 +25,7 @@
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.io.Serializable;
 
@@ -26,9 +49,8 @@
    }
 
    /**
-    * Initialize the navigational state of all the windows on this page.
-    * <p>The page navigational state also carries a list of all the available regions on the page (as defined in the
-    * layout of the page</p>
+    * Initialize the navigational state of all the windows on this page. <p>The page navigational state also carries a
+    * list of all the available regions on the page (as defined in the layout of the page</p>
     *
     * @param windowContexts a Map (keyed by windowId) of WindowContext instances, one for each window on the page
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/navigation/WindowNavigationalState.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.navigation;
 
+import org.jboss.portal.Mode;
 import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
 import java.io.Serializable;
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/ModifiablePageResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import org.jboss.portal.theme.render.ModifiableMarkupResult;

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableRegionResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,29 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
+import org.jboss.portal.common.invocation.AttributeResolver;
 import org.jboss.portal.theme.render.ModifiableMarkupResult;
-import org.jboss.portal.common.invocation.AttributeResolver;
 
 import java.util.Map;
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/ModifiableWindowResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,31 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
 import org.jboss.portal.portlet.Properties;
 import org.jboss.portal.theme.render.ModifiableMarkupResult;
-import org.jboss.portal.common.invocation.AttributeResolver;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
 
 import java.util.Map;
 
@@ -36,15 +36,16 @@
 public final class ModifiableWindowResult extends WindowResult implements ModifiableMarkupResult
 {
    /**
-    * Create a new WindowResult with the information about the renderered portlet.
-    * <p>A window result contains the the rendered markup fragment of the portlet, the title, a map of action urls
-    * to trigger mode and state changes, and the properties that were set as portlet response properties.</p>
+    * Create a new WindowResult with the information about the renderered portlet. <p>A window result contains the the
+    * rendered markup fragment of the portlet, the title, a map of action urls to trigger mode and state changes, and
+    * the properties that were set as portlet response properties.</p>
     *
     * @param title              the title to be displayed for this portlet in the rendered page
     * @param content            the rendered markup fragment of the portlet
     * @param actions            a map of actions possible for this portlet
     * @param windowProperties   the properties for this window
-    * @param responseProperties the properties that were set as response properties during the portlet's render or action
+    * @param responseProperties the properties that were set as response properties during the portlet's render or
+    *                           action
     * @param headerChars        content that needs to be injected into the header
     * @see org.jboss.portal.theme.page.WindowResult.Action
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/PageResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import org.jboss.portal.theme.render.MarkupResult;
-import org.jboss.portal.common.invocation.AttributeResolver;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Interface to represent the read only information of a rendered portal page.
- * <p>The page result allows access to all the information needed to generate the final markup.
+ * Interface to represent the read only information of a rendered portal page. <p>The page result allows access to all
+ * the information needed to generate the final markup.
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/PageService.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import org.jboss.portal.theme.LayoutService;

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/Region.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/Region.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/Region.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.HashMap;
 
 /**
- * A region on a page.
- * <p>A region wraps one or more portlets to allow them to act as one unit inside the layout of a page.</p>
+ * A region on a page. <p>A region wraps one or more portlets to allow them to act as one unit inside the layout of a
+ * page.</p>
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -45,7 +46,8 @@
    private Map properties;
 
    /**
-    * Create a region with default orientation (how the portlet windows are arranged) and the region name as the css id selector
+    * Create a region with default orientation (how the portlet windows are arranged) and the region name as the css id
+    * selector
     *
     * @param name the name of the region to create
     */
@@ -95,33 +97,25 @@
       properties.put(name, value);
    }
 
-   /**
-    * @return the identifier of this region (i.e. the name of this region)
-    */
+   /** @return the identifier of this region (i.e. the name of this region) */
    public String getId()
    {
       return name;
    }
 
-   /**
-    * @return the attribute value to use in the markup to allow a css selector to select this region
-    */
+   /** @return the attribute value to use in the markup to allow a css selector to select this region */
    public String getCssId()
    {
       return cssId;
    }
 
-   /**
-    * @return the orientation of this region
-    */
+   /** @return the orientation of this region */
    public RegionOrientation getOrientation()
    {
       return orientation;
    }
 
-   /**
-    * @return if there are any portlet windows in this region
-    */
+   /** @return if there are any portlet windows in this region */
    public boolean isEmpty()
    {
       if (windows == null)
@@ -146,8 +140,8 @@
    }
 
    /**
-    * Get a list of all window contexts in this region. The list is sorted by order
-    * according to the order provided in the window definition.
+    * Get a list of all window contexts in this region. The list is sorted by order according to the order provided in
+    * the window definition.
     *
     * @return a sorted list of <code>org.jboss.portal.theme.page.WindowContext</code> items
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/RegionNames.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/RegionNames.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/RegionNames.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/RegionOrientation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 /**
@@ -30,14 +31,10 @@
  */
 public final class RegionOrientation
 {
-   /**
-    * Place portlets in one region in vertical order.
-    */
+   /** Place portlets in one region in vertical order. */
    public static final RegionOrientation VERTICAL = new RegionOrientation("vertical");
 
-   /**
-    * Place portlets in one region in horizontal order.
-    */
+   /** Place portlets in one region in horizontal order. */
    public static final RegionOrientation HORIZONTAL = new RegionOrientation("horizontal");
 
    public static final RegionOrientation DEFAULT = VERTICAL;

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/RegionResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,28 +1,28 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import org.jboss.portal.theme.render.MarkupResult;
-import org.jboss.portal.common.invocation.AttributeResolver;
 
 import java.util.Map;
 

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,34 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import java.io.Serializable;
 
 /**
- * A WindowContext represents a portlet window on a page in the scope of one request.
- * <p>It allows the layout strategy for instance, to change the position of the window on the page (region, order) without
- * persising the change. The change will only be valid for the term of the current request.</p>
- * <p>This context implements the <code>Comparable</code> interface to allow natural sorting of the windows in one
- * region, based on their order.</p>
+ * A WindowContext represents a portlet window on a page in the scope of one request. <p>It allows the layout strategy
+ * for instance, to change the position of the window on the page (region, order) without persising the change. The
+ * change will only be valid for the term of the current request.</p> <p>This context implements the
+ * <code>Comparable</code> interface to allow natural sorting of the windows in one region, based on their order.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$

Modified: trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/page/WindowResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.page;
 
 import org.jboss.portal.Mode;
@@ -30,13 +31,8 @@
 import java.util.Map;
 
 /**
- * The window result represent the generated content of a window.
- * It contains several kind of data :
- * <li>
- * <ul>the window title</ul>
- * <ul>the window content</ul>
- * <ul>a map of actions available for the window</ul>
- * </li>
+ * The window result represent the generated content of a window. It contains several kind of data : <li> <ul>the window
+ * title</ul> <ul>the window content</ul> <ul>a map of actions available for the window</ul> </li>
  *
  * @author <a href="mailto:julien at jboss.org">Julien Viet</a>
  * @version $Revision$
@@ -55,15 +51,16 @@
    public static final String WINDOWSTATES_KEY = "windowstate";
 
    /**
-    * Create a new WindowResult with the information about the renderered portlet.
-    * <p>A window result contains the the rendered markup fragment of the portlet, the title, a map of action urls
-    * to trigger mode and state changes, and the properties that were set as portlet response properties.</p>
+    * Create a new WindowResult with the information about the renderered portlet. <p>A window result contains the the
+    * rendered markup fragment of the portlet, the title, a map of action urls to trigger mode and state changes, and
+    * the properties that were set as portlet response properties.</p>
     *
     * @param title              the title to be displayed for this portlet in the rendered page
     * @param content            the rendered markup fragment of the portlet
     * @param actions            a map of actions possible for this portlet
     * @param windowProperties   the properties for this window
-    * @param responseProperties the properties that were set as response properties during the portlet's render or action
+    * @param responseProperties the properties that were set as response properties during the portlet's render or
+    *                           action
     * @param headerChars        content that needs to be injected into the header
     * @see WindowResult.Action
     */
@@ -114,17 +111,13 @@
       return (Collection)actions.get(familyName);
    }
 
-   /**
-    * @return the response properties that were set by the portlet during the render or action
-    */
+   /** @return the response properties that were set by the portlet during the render or action */
    public Properties getResponseProperties()
    {
       return properties;
    }
 
-   /**
-    * @return the properties that were set for this particular window
-    */
+   /** @return the properties that were set for this particular window */
    public Map getWindowProperties()
    {
       return windowProperties;
@@ -157,19 +150,13 @@
     */
    public static class Action
    {
-      /**
-       * The origin of the action.
-       */
+      /** The origin of the action. */
       private final Object origin;
 
-      /**
-       * The action url.
-       */
+      /** The action url. */
       private final String url;
 
-      /**
-       * Enabled or not.
-       */
+      /** Enabled or not. */
       private final boolean enabled;
 
       public Action(Object origin, String url, boolean enabled)

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/DecorationRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
 
 /**
- * A decoration renderer is responsible for generating the markup of the portlet window title bar.
- * <p>The decoration renderer has the responsibility to create the title , the window state links, and the portlet mode
- * links. It is intended to be called by the <code>WindowRenderer</code> to produce part of the markup of a
- * portlet wiindow. The other parts are intended to be created by the <code>PortletRenderer</code>, and
- * the <code>WindowRenderer</code> itself.</p>
+ * A decoration renderer is responsible for generating the markup of the portlet window title bar. <p>The decoration
+ * renderer has the responsibility to create the title , the window state links, and the portlet mode links. It is
+ * intended to be called by the <code>WindowRenderer</code> to produce part of the markup of a portlet wiindow. The
+ * other parts are intended to be created by the <code>PortletRenderer</code>, and the <code>WindowRenderer</code>
+ * itself.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/FragmentAssembler.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.theme.page.PageService;
@@ -8,11 +31,10 @@
 import java.io.IOException;
 
 /**
- * Express the capability to assemble the fragments presented by a markup result into a markup response.
- * <p>The markup result is an abstraction ontop of page, window, portlet , etc. results, and contains the markup
- * fragments that were produced by the portlet container. The fragment assemblers responsibility is to take these fragments,
- * and assemble them into a markup response that can be sent back to the displaying device.
- * </p>
+ * Express the capability to assemble the fragments presented by a markup result into a markup response. <p>The markup
+ * result is an abstraction ontop of page, window, portlet , etc. results, and contains the markup fragments that were
+ * produced by the portlet container. The fragment assemblers responsibility is to take these fragments, and assemble
+ * them into a markup response that can be sent back to the displaying device. </p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>
  * @version $Revision$
@@ -32,7 +54,8 @@
       throws IOException, ServletException;
 
    /**
-    * provide a page service reference that can be used during the assembly to access the page, layout, and theme service
+    * provide a page service reference that can be used during the assembly to access the page, layout, and theme
+    * service
     *
     * @param pageService the page service to allow access to themes and layouts
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,30 +1,31 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
+import org.jboss.portal.theme.PortalTheme;
+import org.jboss.portal.theme.ThemeResult;
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
-import org.jboss.portal.theme.ThemeResult;
-import org.jboss.portal.theme.PortalTheme;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -117,8 +118,8 @@
    }
 
    /**
-    * Get the uri of the layout that is used.
-    * <p>The uri is relative to the application context that hosts the layout.</p>
+    * Get the uri of the layout that is used. <p>The uri is relative to the application context that hosts the
+    * layout.</p>
     *
     * @return the uri of the used layout
     */
@@ -128,9 +129,9 @@
    }
 
    /**
-    * Get the state string of the layout.
-    * <p>The state is used to further sub select a layout uri. One layout can contain a separate layout uri per state.
-    * The state has to match to string version of one of the allowed window states.<p>
+    * Get the state string of the layout. <p>The state is used to further sub select a layout uri. One layout can
+    * contain a separate layout uri per state. The state has to match to string version of one of the allowed window
+    * states.<p>
     *
     * @return a string representing the current window state to potentially further select a more specific layout uri
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/ModifiableMarkupResult.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.theme.page.WindowContext;

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/PortalRenderSet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.common.MediaType;
@@ -31,9 +32,9 @@
 import org.jboss.portal.theme.metadata.RendererSetMetaData;
 
 /**
- * The portal render set is a set of renderer implementations for the markup container of a page.
- * <p>A render set consists of 4 iterface implementations with some meta data describing the web application the render
- * set is coming from, and the content type it is capable of handling.</p>
+ * The portal render set is a set of renderer implementations for the markup container of a page. <p>A render set
+ * consists of 4 iterface implementations with some meta data describing the web application the render set is coming
+ * from, and the content type it is capable of handling.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>
@@ -54,9 +55,12 @@
    /**
     * construct a render set
     *
-    * @param renderSetName  the name of the render set as defined in the portal-renderSet.xml descriptor, or null if it was defined as part of a layout descriptor.
-    * @param runtimeContext the runtime environment (data describing the portal web application in wich the render set was defined)
-    * @param rendererSetMD  meta data about an individual set of 4 renderer implementation together with their supported content type
+    * @param renderSetName  the name of the render set as defined in the portal-renderSet.xml descriptor, or null if it
+    *                       was defined as part of a layout descriptor.
+    * @param runtimeContext the runtime environment (data describing the portal web application in wich the render set
+    *                       was defined)
+    * @param rendererSetMD  meta data about an individual set of 4 renderer implementation together with their supported
+    *                       content type
     * @throws IllegalAccessException
     * @throws InstantiationException
     * @throws ClassNotFoundException
@@ -65,11 +69,11 @@
    {
       // there CAN be render sets without a name !
 
-      if(runtimeContext == null)
+      if (runtimeContext == null)
       {
          throw new IllegalArgumentException("no valid container");
       }
-      if(rendererSetMD == null)
+      if (rendererSetMD == null)
       {
          throw new IllegalArgumentException("no valid set");
       }
@@ -79,19 +83,19 @@
       this.contentType = rendererSetMD.getContentType();
       this.ajaxEnabled = rendererSetMD.isAjaxEnabled();
 
-      if(ajaxEnabled) // wrap the current renderer with the ajax delegator one.
+      if (ajaxEnabled) // wrap the current renderer with the ajax delegator one.
       {
-         this.regionRenderer = new DynaRegionRenderer((RegionRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer()));
-         this.windowRenderer = new DynaWindowRenderer((WindowRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer()));
-         this.portletRenderer = new DynaPortletRenderer((PortletRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer()));
-         this.decorationRenderer = new DynaDecorationRenderer((DecorationRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer()));
+         this.regionRenderer = new DynaRegionRenderer((RegionRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer()));
+         this.windowRenderer = new DynaWindowRenderer((WindowRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer()));
+         this.portletRenderer = new DynaPortletRenderer((PortletRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer()));
+         this.decorationRenderer = new DynaDecorationRenderer((DecorationRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer()));
       }
       else
       {
-         this.regionRenderer = (RegionRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer());
-         this.windowRenderer = (WindowRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer());
-         this.portletRenderer = (PortletRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer());
-         this.decorationRenderer = (DecorationRenderer) loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer());
+         this.regionRenderer = (RegionRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getRegionRenderer());
+         this.windowRenderer = (WindowRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getWindowRenderer());
+         this.portletRenderer = (PortletRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getPortletRenderer());
+         this.decorationRenderer = (DecorationRenderer)loadRenderer(runtimeContext.getClassLoader(), rendererSetMD.getDecorationRenderer());
       }
    }
 
@@ -100,9 +104,7 @@
       return registrationId;
    }
 
-   /**
-    * @see PortalRenderSet#getMediaType
-    */
+   /** @see PortalRenderSet#getMediaType */
    public MediaType getMediaType()
    {
       return contentType;
@@ -128,50 +130,40 @@
       return name;
    }
 
-   /**
-    * @see PortalRenderSet#getRegionRenderer
-    */
+   /** @see PortalRenderSet#getRegionRenderer */
    public RegionRenderer getRegionRenderer()
    {
       return regionRenderer;
    }
 
-   /**
-    * @see PortalRenderSet#getWindowRenderer
-    */
+   /** @see PortalRenderSet#getWindowRenderer */
    public WindowRenderer getWindowRenderer()
    {
       return windowRenderer;
    }
 
-   /**
-    * @see org.jboss.portal.theme.render.PortalRenderSet#getPortletRenderer
-    */
+   /** @see org.jboss.portal.theme.render.PortalRenderSet#getPortletRenderer */
    public PortletRenderer getPortletRenderer()
    {
       return portletRenderer;
    }
 
-   /**
-    * @see PortalRenderSet#getDecorationRenderer
-    */
+   /** @see PortalRenderSet#getDecorationRenderer */
    public DecorationRenderer getDecorationRenderer()
    {
       return decorationRenderer;
    }
 
-   /**
-    * @see java.lang.Object#toString
-    */
+   /** @see java.lang.Object#toString */
    public String toString()
    {
       return "PortalRenderSet: " + getAppId() + "." + (getName() == null ? "<from layout>" : getName()) + ": " +
-             getMediaType() + " [" + getRegionRenderer() + "][" + getWindowRenderer() + "][" + getDecorationRenderer() +
-             "][" + getPortletRenderer() + "]";
+         getMediaType() + " [" + getRegionRenderer() + "][" + getWindowRenderer() + "][" + getDecorationRenderer() +
+         "][" + getPortletRenderer() + "]";
    }
 
    private Renderer loadRenderer(ClassLoader loader, String className) throws ClassNotFoundException, IllegalAccessException, InstantiationException
    {
-      return (Renderer) loader.loadClass(className).newInstance();
+      return (Renderer)loader.loadClass(className).newInstance();
    }
 }

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/PortletRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,35 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
 
 /**
- * The portlet renderer is responsible for adding the created markup of a portlet to the page.
- * <p>The portlet renderer is intended to be called by the <code>WindowRenderer</code> as part of the
- * generation of the markup for a portlet window. The portlet renderer is not responsible for generating
- * the decoration markup, like the title. The <code>DecorationRenderer</code> is responsible for that. It is also
- * called by the <code>WindowRenderer</code> as part of the render process for one portlet window.</p>
+ * The portlet renderer is responsible for adding the created markup of a portlet to the page. <p>The portlet renderer
+ * is intended to be called by the <code>WindowRenderer</code> as part of the generation of the markup for a portlet
+ * window. The portlet renderer is not responsible for generating the decoration markup, like the title. The
+ * <code>DecorationRenderer</code> is responsible for that. It is also called by the <code>WindowRenderer</code> as part
+ * of the render process for one portlet window.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -41,10 +42,9 @@
    extends Renderer
 {
    /**
-    * Render the markup of a portlet.
-    * <p>Note: this is not calling the portlet container to produce the markup. The markup has already been created.
-    * The PortletRenderer only places the markup on the page, and can gnerate some containing markup around it if it
-    * chooses to do so</p>.
+    * Render the markup of a portlet. <p>Note: this is not calling the portlet container to produce the markup. The
+    * markup has already been created. The PortletRenderer only places the markup on the page, and can gnerate some
+    * containing markup around it if it chooses to do so</p>.
     *
     * @param renderContext the state holder to provide information about the region, it's portlets, and the render set,
     *                      which allows access to the other renderer interfaces of the render set.

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/RegionRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.theme.page.Region;
@@ -26,12 +27,11 @@
 import java.util.Map;
 
 /**
- * A region renderer is responsible to create the markup container for a set of portlets on a page region.
- * <p>The Portlets on a portal page can be assigned to regions of that page. Regions are sub elements of a page, that
- * will be used by a layout to position groups of portlets over the areas of the page.
- * The region renderer can be invoked to render the entire content of the region. It is assumed to take over the
- * responsibility of delegating to the <code>WindowRenderer</code> for each portlet that needs to be rendered in the
- * region in question.</p>
+ * A region renderer is responsible to create the markup container for a set of portlets on a page region. <p>The
+ * Portlets on a portal page can be assigned to regions of that page. Regions are sub elements of a page, that will be
+ * used by a layout to position groups of portlets over the areas of the page. The region renderer can be invoked to
+ * render the entire content of the region. It is assumed to take over the responsibility of delegating to the
+ * <code>WindowRenderer</code> for each portlet that needs to be rendered in the region in question.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.common.MediaType;
@@ -38,10 +39,9 @@
 import java.util.Map;
 
 /**
- * A render context to render a context on a page.
- * <p>A render context is scoped to a MarkupContainer (a region, or a window). A render context that is not scoped to
- * a MarkupContainer is ment to be a page level template to allow easier creation of the region and window render contexts
- * via the <code>RenderContext.getContext()</code> methods.</p>
+ * A render context to render a context on a page. <p>A render context is scoped to a MarkupContainer (a region, or a
+ * window). A render context that is not scoped to a MarkupContainer is ment to be a page level template to allow easier
+ * creation of the region and window render contexts via the <code>RenderContext.getContext()</code> methods.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -64,7 +64,7 @@
    private void init(PortalLayout layout, Object fragment, HTTPStreamInfo streamInfo, MarkupResult result, ServerRequest request)
    {
       this.renderSet = layout.getServiceInfo().getRenderSet(layout.getLayoutInfo(), streamInfo, result);
-      if(renderSet == null)
+      if (renderSet == null)
       {
          throw new IllegalStateException("No RenderSet determined");
       }
@@ -77,10 +77,10 @@
       this.fragment = fragment;
       this.streamInfo = streamInfo;
 
-      if(fragment != null && fragment instanceof Region)
+      if (fragment != null && fragment instanceof Region)
       {
-         orientation = ((Region) fragment).getOrientation();
-         regionCssId = ((Region) fragment).getCssId();
+         orientation = ((Region)fragment).getOrientation();
+         regionCssId = ((Region)fragment).getCssId();
       }
       else
       {
@@ -95,8 +95,8 @@
    }
 
    /**
-    * Create a new render context for the provided result.
-    * <p>The result contains information about the markup container (page, region , window context) to render.</p>
+    * Create a new render context for the provided result. <p>The result contains information about the markup container
+    * (page, region , window context) to render.</p>
     *
     * @param layout     the layout that is used for this render context
     * @param streamInfo information about the content type and encoding to use when writing the response
@@ -105,33 +105,33 @@
     */
    public RenderContext(PortalLayout layout, HTTPStreamInfo streamInfo, MarkupResult result, ServerRequest request)
    {
-      if(layout == null)
+      if (layout == null)
       {
          throw new IllegalArgumentException("no layout provided");
       }
-      if(streamInfo == null)
+      if (streamInfo == null)
       {
          throw new IllegalArgumentException("no stream info provided");
       }
-      if(result == null)
+      if (result == null)
       {
          throw new IllegalArgumentException("no result provided");
       }
-      if(request == null)
+      if (request == null)
       {
          throw new IllegalArgumentException("no request provided");
       }
 
-      if(result instanceof RegionResult)
+      if (result instanceof RegionResult)
       {
          // create the context for this region
-         Region region = ((RegionResult) result).getRegion();
+         Region region = ((RegionResult)result).getRegion();
          init(layout, region, streamInfo, result, request);
       }
-      else if(result instanceof WindowResult)
+      else if (result instanceof WindowResult)
       {
          // create the context for this window only
-         WindowContext windowContext = ((WindowResult) result).getWindowContext();
+         WindowContext windowContext = ((WindowResult)result).getWindowContext();
          init(layout, windowContext, streamInfo, result, request);
       }
       else
@@ -142,24 +142,23 @@
    }
 
    /**
-    * copy constructor.
-    * <p>Get a render context for a region, based on the state of this render context, but
-    * with the provided css id and orientation (which overwrite the values in the provided region)</p>
+    * copy constructor. <p>Get a render context for a region, based on the state of this render context, but with the
+    * provided css id and orientation (which overwrite the values in the provided region)</p>
     *
     * @param region      the region to get the render context for
-    * @param cssId       the id attribute value to generate for this region (needs to be unique in the page for the css to be
-    *                    able to select this region to style)
+    * @param cssId       the id attribute value to generate for this region (needs to be unique in the page for the css
+    *                    to be able to select this region to style)
     * @param orientation the orintation of multiple windows in this region (arranged horizontally or vertically)
     * @return a new render context for the provided region
     */
    public RenderContext getContext(Region region, String cssId, RegionOrientation orientation)
    {
       RenderContext context = new RenderContext(this.layout, region, this.streamInfo, this.result, this.request);
-      if(cssId != null)
+      if (cssId != null)
       {
          context.regionCssId = cssId;
       }
-      if(orientation != null)
+      if (orientation != null)
       {
          context.orientation = orientation;
       }
@@ -167,8 +166,8 @@
    }
 
    /**
-    * copy constructor.
-    * <p>Get the render context for the provided window context, using the current context as a template for layout, stream info,....</p>
+    * copy constructor. <p>Get the render context for the provided window context, using the current context as a
+    * template for layout, stream info,....</p>
     *
     * @param windowContext the window (context) to get the render context for
     * @return a render context that can render the markup for the provided window context
@@ -178,71 +177,59 @@
       return new RenderContext(layout, windowContext, streamInfo, result, request);
    }
 
-   /**
-    * @return a markup fragment
-    */
+   /** @return a markup fragment */
    public StringBuffer getMarkupFragment()
    {
       return markup;
    }
 
-   /**
-    * @return the content type
-    */
+   /** @return the content type */
    public MediaType getContentType()
    {
       return streamInfo.getContentType();
    }
 
-   /**
-    * @return the encoding to use when writing to the output
-    */
+   /** @return the encoding to use when writing to the output */
    public String getCharset()
    {
       return streamInfo.getCharset();
    }
 
-   /**
-    * @return the region orientation
-    */
+   /** @return the region orientation */
    public RegionOrientation getRegionOrientation()
    {
       return orientation;
    }
 
-   /**
-    * @return metadata about the layout used for this render context
-    */
+   /** @return metadata about the layout used for this render context */
    public LayoutInfo getLayoutInfo()
    {
       return layout.getLayoutInfo();
    }
 
-   /**
-    * @return the region renderer for the determined renderset of this context
-    */
+   /** @return the region renderer for the determined renderset of this context */
    public RegionRenderer getRegionRenderer()
    {
       return renderSet.getRegionRenderer();
    }
 
    /**
-    * Get the region renderer from the render set whose name was provided.
-    * <p>If no render set name was provided, this method is identical to the no arg version</p>
+    * Get the region renderer from the render set whose name was provided. <p>If no render set name was provided, this
+    * method is identical to the no arg version</p>
     *
     * @param renderSetName the name of an alternative render set to get the region renderer from
     * @return a region renderer
     */
    public RegionRenderer getRegionRenderer(String renderSetName)
    {
-      if(renderSetName == null)
+      if (renderSetName == null)
       {
          return getRegionRenderer();
       }
 
       PortalRenderSet renderSet = layout.getServiceInfo().getRenderSet(renderSetName, streamInfo.getContentType());
 
-      if(renderSet != null)
+      if (renderSet != null)
       {
          return renderSet.getRegionRenderer();
       }
@@ -250,41 +237,39 @@
       return null;
    }
 
-   /**
-    * @return the window renderer for the determined render set of this context
-    */
+   /** @return the window renderer for the determined render set of this context */
    public WindowRenderer getWindowRenderer()
    {
       return renderSet.getWindowRenderer();
    }
 
    /**
-    * Get the window renderer for the provided window.
-    * <p>The window result can optionally contain a window property that points to a render set to use when getting the window renderer.
-    * If no window property was provided, then the default render set of this context will be used.</p>
+    * Get the window renderer for the provided window. <p>The window result can optionally contain a window property
+    * that points to a render set to use when getting the window renderer. If no window property was provided, then the
+    * default render set of this context will be used.</p>
     *
-    * @param result the window result possibly containing the window property that specifies an alternative render set name
-    *               for the window renderer to use
+    * @param result the window result possibly containing the window property that specifies an alternative render set
+    *               name for the window renderer to use
     * @return a window renderer
     */
    public WindowRenderer getWindowRenderer(WindowResult result)
    {
       String renderSetName = null;
-      if(result != null)
+      if (result != null)
       {
-         renderSetName = (String) result.getWindowProperties().get(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
+         renderSetName = (String)result.getWindowProperties().get(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
       }
 
-      if(result != null && renderSetName == null)
+      if (result != null && renderSetName == null)
       {
-         renderSetName = (String) result.getPageProperties().get(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
+         renderSetName = (String)result.getPageProperties().get(ThemeConstants.PORTAL_PROP_WINDOW_RENDERER);
       }
 
-      if(renderSetName != null)
+      if (renderSetName != null)
       {
          PortalRenderSet renderSet = layout.getServiceInfo().getRenderSet(renderSetName, streamInfo.getContentType());
 
-         if(renderSet != null)
+         if (renderSet != null)
          {
             return renderSet.getWindowRenderer();
          }
@@ -293,42 +278,40 @@
       return getWindowRenderer();
    }
 
-   /**
-    * @return a decoration renderer from the determined render set
-    */
+   /** @return a decoration renderer from the determined render set */
    public DecorationRenderer getDecorationRenderer()
    {
       return renderSet.getDecorationRenderer();
    }
 
    /**
-    * Get the decoration renderer for the window that the provided window result is associated with.
-    * <p>If the window result contains a window property that points to a render set, that render set will be used to determine
-    * the decoration renderer. Otherwise, the render set that was determined for this context will be used.</p>
+    * Get the decoration renderer for the window that the provided window result is associated with. <p>If the window
+    * result contains a window property that points to a render set, that render set will be used to determine the
+    * decoration renderer. Otherwise, the render set that was determined for this context will be used.</p>
     *
-    * @param result the window result possibly containing the window property that specifies an alternative render set name
-    *               for the decoration renderer to use
+    * @param result the window result possibly containing the window property that specifies an alternative render set
+    *               name for the decoration renderer to use
     * @return a decoration renderer
     */
    public DecorationRenderer getDecorationRenderer(WindowResult result)
    {
       String renderSetName = null;
 
-      if(result != null)
+      if (result != null)
       {
-         renderSetName = (String) result.getWindowProperties().get(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
+         renderSetName = (String)result.getWindowProperties().get(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
       }
 
-      if(result != null && renderSetName == null)
+      if (result != null && renderSetName == null)
       {
-         renderSetName = (String) result.getPageProperties().get(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
+         renderSetName = (String)result.getPageProperties().get(ThemeConstants.PORTAL_PROP_DECORATION_RENDERER);
       }
 
-      if(renderSetName != null)
+      if (renderSetName != null)
       {
          PortalRenderSet renderSet = layout.getServiceInfo().getRenderSet(renderSetName, streamInfo.getContentType());
 
-         if(renderSet != null)
+         if (renderSet != null)
          {
             return renderSet.getDecorationRenderer();
          }
@@ -348,32 +331,33 @@
    }
 
    /**
-    * Get the portlet renderer for the render set defined in the window properties that were provided.
-    * <p>If the provided window result doesn't contain any window property that defines a render set name, the default render
-    * set that was determined for this context will be used to get the portlet renderer.</p>
+    * Get the portlet renderer for the render set defined in the window properties that were provided. <p>If the
+    * provided window result doesn't contain any window property that defines a render set name, the default render set
+    * that was determined for this context will be used to get the portlet renderer.</p>
     *
-    * @param result the window result containing the window properties to introspect for a render set name to get the portlet renderer from
+    * @param result the window result containing the window properties to introspect for a render set name to get the
+    *               portlet renderer from
     * @return a portlet renderer
     */
    public PortletRenderer getPortletRenderer(WindowResult result)
    {
       String renderSetName = null;
 
-      if(result != null)
+      if (result != null)
       {
-         renderSetName = (String) result.getWindowProperties().get(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
+         renderSetName = (String)result.getWindowProperties().get(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
       }
 
-      if(result != null && renderSetName == null)
+      if (result != null && renderSetName == null)
       {
-         renderSetName = (String) result.getPageProperties().get(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
+         renderSetName = (String)result.getPageProperties().get(ThemeConstants.PORTAL_PROP_PORTLET_RENDERER);
       }
 
-      if(renderSetName != null)
+      if (renderSetName != null)
       {
          PortalRenderSet renderSet = layout.getServiceInfo().getRenderSet(renderSetName, streamInfo.getContentType());
 
-         if(renderSet != null)
+         if (renderSet != null)
          {
             return renderSet.getPortletRenderer();
          }
@@ -382,25 +366,19 @@
       return getPortletRenderer();
    }
 
-   /**
-    * @return the region CSS id
-    */
+   /** @return the region CSS id */
    public String getRegionID()
    {
       return regionCssId;
    }
 
-   /**
-    * @return the page properties
-    */
+   /** @return the page properties */
    public Map getPageProperties()
    {
       return result.getPageProperties();
    }
 
-   /**
-    * @return the names of all the regions as defined in the layout
-    */
+   /** @return the names of all the regions as defined in the layout */
    public List getLayoutRegionNames()
    {
       return layout.getLayoutInfo().getRegionNames();
@@ -416,30 +394,26 @@
    public String getProperty(WindowResult result, String key)
    {
       String value = null;
-      if(result != null)
+      if (result != null)
       {
-         value = (String) result.getWindowProperties().get(key);
+         value = (String)result.getWindowProperties().get(key);
       }
 
-      if(result != null && value == null)
+      if (result != null && value == null)
       {
-         value = (String) result.getPageProperties().get(key);
+         value = (String)result.getPageProperties().get(key);
       }
 
       return value;
    }
 
-   /**
-    * @return the prefered locale
-    */
+   /** @return the prefered locale */
    public Locale getLocale()
    {
       return request.getLocale();
    }
 
-   /**
-    * @return all locales allowed in the current request
-    */
+   /** @return all locales allowed in the current request */
    public Locale[] getLocales()
    {
       return request.getLocales();
@@ -447,27 +421,27 @@
 
    /**
     * Render this context and it's children (i.e. create the markup of this context and write it to the markup fragment
-    * of this context)
-    * <p>Currently this context only knows how to render fragments of a page (i.e. region,window), not the entire page.</p>
+    * of this context) <p>Currently this context only knows how to render fragments of a page (i.e. region,window), not
+    * the entire page.</p>
     *
     * @throws RenderException .
     * @see #getMarkupFragment
     */
    public void render() throws RenderException
    {
-      if(fragment != null)
+      if (fragment != null)
       {
-         if(fragment instanceof WindowContext)
+         if (fragment instanceof WindowContext)
          {
             // render the window
-            WindowContext wc = (WindowContext) fragment;
+            WindowContext wc = (WindowContext)fragment;
             WindowResult windowResult = result.getWindowResult(wc.getId());
-            getWindowRenderer(windowResult).render(this, (WindowContext) fragment, windowResult);
+            getWindowRenderer(windowResult).render(this, (WindowContext)fragment, windowResult);
          }
-         else if(fragment instanceof Region)
+         else if (fragment instanceof Region)
          {
             // render the region
-            getRegionRenderer().render(this, (Region) fragment, result.getWindowContextMap(), result.getWindowResultMap());
+            getRegionRenderer().render(this, (Region)fragment, result.getWindowContextMap(), result.getWindowResultMap());
          }
          else
          {

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/RenderException.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/RenderException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/RenderException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 /**
@@ -33,24 +34,18 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 6960212365830368099L;
 
-   /**
-    * @see java.lang.Exception
-    */
+   /** @see java.lang.Exception */
    public RenderException()
    {
    }
 
-   /**
-    * @see java.lang.Exception
-    */
+   /** @see java.lang.Exception */
    public RenderException(Throwable t)
    {
       super(t);
    }
 
-   /**
-    * @see java.lang.Exception
-    */
+   /** @see java.lang.Exception */
    public RenderException(String message)
    {
       super(message);

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/Renderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/Renderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/Renderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 /**
@@ -31,16 +32,15 @@
 public interface Renderer
 {
    /**
-    * Start the render process for this renderer.
-    * <p>This is a convenient way yo open tags, like a table or a div</p>
+    * Start the render process for this renderer. <p>This is a convenient way yo open tags, like a table or a div</p>
     *
     * @param ctx the render context allowing access to state information of the current render process
     */
    void renderStart(RenderContext ctx);
 
    /**
-    * End the render process for this renderer.
-    * <p>This is a convenient way yo close the tags that where opened by <code>renderStart</code></p>
+    * End the render process for this renderer. <p>This is a convenient way yo close the tags that where opened by
+    * <code>renderStart</code></p>
     *
     * @param ctx the render context allowing access to state information of the current render process
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/WindowRenderer.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.render;
 
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
 
 /**
- * A window renderer is responsible for the creation of the markup of each portlet window in a portal page region.
- * <p>A Portlet window is the frame (the container) around the markup gernerated by the Portlet. It includes things like
- * the title, and the portlet mode and portlet window state information. The window renderer is assumed to delegate
- * to the <code>DecorationRenderer</code> to generate the title and mode and state markup, and to the
+ * A window renderer is responsible for the creation of the markup of each portlet window in a portal page region. <p>A
+ * Portlet window is the frame (the container) around the markup gernerated by the Portlet. It includes things like the
+ * title, and the portlet mode and portlet window state information. The window renderer is assumed to delegate to the
+ * <code>DecorationRenderer</code> to generate the title and mode and state markup, and to the
  * <code>PortletRenderer</code> to render the markup produced by the portlet. Note that the renderer do not call the
  * portlet container to execute the doView doEdit etc. method. The renderer is only responsible for placing the created
  * markup inside the page, and creating the necessary markup around it.</p>

Modified: trunk/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/servlet/DynaAjaxServlet.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, a division of Red Hat
-* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 
 package org.jboss.portal.theme.servlet;
 
@@ -42,21 +43,21 @@
    private final static Logger log = Logger.getLogger(DynaAjaxServlet.class);
 
    public void doGet(HttpServletRequest req, HttpServletResponse resp)
-         throws ServletException, IOException
+      throws ServletException, IOException
    {
       doPost(req, resp);
    }
 
    public void doPost(HttpServletRequest req, HttpServletResponse resp)
-         throws ServletException, IOException
+      throws ServletException, IOException
    {
       Enumeration paramNames = req.getParameterNames();
       String response = "";
-      while(paramNames.hasMoreElements())
+      while (paramNames.hasMoreElements())
       {
-         String name = (String) paramNames.nextElement();
+         String name = (String)paramNames.nextElement();
          // action: windowremove|windowmove
-         if("action".equalsIgnoreCase(name))
+         if ("action".equalsIgnoreCase(name))
          {
             response = req.getParameter(name);
          }
@@ -123,7 +124,7 @@
    }
 
    private void sendResp(HttpServletResponse resp, String respData)
-         throws IOException
+      throws IOException
    {
       resp.setHeader("Expires", "Mon, 26 Jul 1997 05:00:00 GMT");
       resp.setDateHeader("Last-Modified", new Date().getTime());

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/LayoutStrategy.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,34 +1,35 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.strategy;
 
 import org.jboss.portal.common.MediaType;
+import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.ServerRegistrationID;
-import org.jboss.portal.theme.RuntimeContext;
 import org.jboss.portal.theme.metadata.LayoutStrategyMetaData;
 
 /**
- * Abstract implementation of the layout strategy.
- * <p>This implementation serves as base class for all layout strategies.</p>
+ * Abstract implementation of the layout strategy. <p>This implementation serves as base class for all layout
+ * strategies.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/NavigationalStateChangedEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme.strategy;
 
 import org.jboss.portal.Mode;

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyContext.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.strategy;
 
 import org.apache.log4j.Logger;
@@ -40,10 +41,9 @@
 import java.util.Set;
 
 /**
- * An implementation of the strategy context.
- * <p>The strategy context is used by the layout strategy interceptor to pass the available state information
- * from the portal to the strategy. The context contains information about the current page, the windowIds on it,
- * the state of those windowIds, etc.</p>
+ * An implementation of the strategy context. <p>The strategy context is used by the layout strategy interceptor to pass
+ * the available state information from the portal to the strategy. The context contains information about the current
+ * page, the windowIds on it, the state of those windowIds, etc.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>
@@ -52,9 +52,7 @@
 public final class StrategyContext
 {
 
-   /**
-    * .
-    */
+   /** . */
    private static Logger log = Logger.getLogger(StrategyContext.class);
 
    private final String[] regionNames;
@@ -85,57 +83,43 @@
       }
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#getLayoutRegions()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#getLayoutRegions() */
    public String[] getLayoutRegions()
    {
       return regionNames;
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#createResponse()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#createResponse() */
    public StrategyResponse createResponse()
    {
       return new StrategyResponse();
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#getHttpServletRequest()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#getHttpServletRequest() */
    public HttpServletRequest getHttpServletRequest()
    {
       return httpRequest;
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#getMediaType()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#getMediaType() */
    public MediaType getMediaType()
    {
       return streamInfo.getContentType();
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#getCharSet()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#getCharSet() */
    public String getCharSet()
    {
       return streamInfo.getCharset();
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#isSupportedWindowState(WindowState)
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#isSupportedWindowState(WindowState) */
    public boolean isSupportedWindowState(WindowState state)
    {
       return supportedWindowStates.contains(state);
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyContext#isSupportedPortletMode(Mode)
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyContext#isSupportedPortletMode(Mode) */
    public boolean isSupportedPortletMode(Mode mode)
    {
       return supportedPortletModes.contains(mode);

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyEvent.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
+
 package org.jboss.portal.theme.strategy;
 
 /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyException.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.strategy;
 
 /**

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/StrategyResponse.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.strategy;
 
 import org.jboss.portal.Mode;
@@ -34,7 +35,8 @@
 /**
  * Implementation of the strategy response.
  * <p/>
- * <p>This response is a context for a layout stategy to use in order to communicate desired changes back to the portal.</p>
+ * <p>This response is a context for a layout stategy to use in order to communicate desired changes back to the
+ * portal.</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>
@@ -49,9 +51,7 @@
    private Map windowContextsToRestore;
    private Map windowRegionChangeMap;
 
-   /**
-    * Create a new instance of a response.
-    */
+   /** Create a new instance of a response. */
    StrategyResponse()
    {
       this.stateChangeMap = new HashMap(5);
@@ -61,25 +61,19 @@
       this.windowRegionChangeMap = new HashMap(2);
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#getLayoutURI()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#getLayoutURI() */
    public String getLayoutURI()
    {
       return layoutURI;
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#getWindowStateChangeMap()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#getWindowStateChangeMap() */
    public Map getWindowStateChangeMap()
    {
       return Collections.unmodifiableMap(stateChangeMap);
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#getNoRenderList()
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#getNoRenderList() */
    public List getNoRenderList()
    {
       return Collections.unmodifiableList(noRenderList);
@@ -104,9 +98,7 @@
       return Collections.unmodifiableMap(modeChangeMap);
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#addWindowStateChange
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#addWindowStateChange */
    public void addWindowStateChange(WindowContext portlet, WindowState state)
    {
       if (portlet == null || state == null)
@@ -116,9 +108,7 @@
       stateChangeMap.put(portlet, state);
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#reset
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#reset */
    public void reset()
    {
       stateChangeMap.clear();
@@ -130,35 +120,28 @@
       state = null;
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#setLayoutURI
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#setLayoutURI */
    public void setLayoutURI(String layoutURI)
    {
       this.layoutURI = layoutURI;
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#setLayoutState
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#setLayoutState */
    public void setLayoutState(String state)
    {
       this.state = state;
    }
 
-   /**
-    * @see org.jboss.portal.theme.strategy.StrategyResponse#getLayoutState
-    */
+   /** @see org.jboss.portal.theme.strategy.StrategyResponse#getLayoutState */
    public String getLayoutState()
    {
       return state;
    }
 
    /**
-    * Restore the previous (original?) state of this window context
-    * <p>This is a cnvenience method for cases like the maximized portlet that temporarily moves to another region
-    * while it is maximized. Once the maximized state is changed back, the portlet needs to move back to its original
-    * region and order</p>
+    * Restore the previous (original?) state of this window context <p>This is a cnvenience method for cases like the
+    * maximized portlet that temporarily moves to another region while it is maximized. Once the maximized state is
+    * changed back, the portlet needs to move back to its original region and order</p>
     *
     * @param windowID
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/strategy/WindowLocation.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.strategy;
 
 import org.jboss.portal.theme.page.WindowContext;

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/HeaderContentTagHandler.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag;
 
 import org.jboss.portal.theme.LayoutConstants;
@@ -35,9 +36,9 @@
 import java.util.Map;
 
 /**
- * JSP tag to write the header content set as portlet response property.
- * <p>Portlets can set a response property to signal to the portal that the provided value should be injected into
- * the head of the response document. This tag is the means to inject that content.</p>
+ * JSP tag to write the header content set as portlet response property. <p>Portlets can set a response property to
+ * signal to the portal that the provided value should be injected into the head of the response document. This tag is
+ * the means to inject that content.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/PortletTagHandler.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag;
 
 import org.apache.log4j.Logger;
@@ -38,12 +39,11 @@
 import java.util.Map;
 
 /**
- * Tag handler for the portlet tag.
- * <p>This tag adds the created markup of a Portlet to a page. The portlet tag utilizes a render set to create
- * the markup around the portlet. The render set takes care of the portlet window, hence it creates the markup for
- * the title, and the mode and state links. This tag does not initiate the call to the portlet container, but rather
- * is ment to assist in laying out the rendered markup, after it is generated by the portlet. (place the already rendered
- * markup of portlet x here....)</p>
+ * Tag handler for the portlet tag. <p>This tag adds the created markup of a Portlet to a page. The portlet tag utilizes
+ * a render set to create the markup around the portlet. The render set takes care of the portlet window, hence it
+ * creates the markup for the title, and the mode and state links. This tag does not initiate the call to the portlet
+ * container, but rather is ment to assist in laying out the rendered markup, after it is generated by the portlet.
+ * (place the already rendered markup of portlet x here....)</p>
  *
  * @author <a href="mailto:mholzner at novell.com">Martin Holzner</a>.
  * @version <tt>$Revision$</tt>
@@ -55,10 +55,10 @@
    private String windowName = null;
 
    /**
-    * create the markup of this tag
-    * <p>Get a render set from the renderer factory, and call the window renderer to generate the root container for
-    * this Portlet's markup. The window renderer then delegates to the decoration renderer and the portlet renderer
-    * to create the markup for the title and the mode and state links, and to add the Portlet's markup.</p>
+    * create the markup of this tag <p>Get a render set from the renderer factory, and call the window renderer to
+    * generate the root container for this Portlet's markup. The window renderer then delegates to the decoration
+    * renderer and the portlet renderer to create the markup for the title and the mode and state links, and to add the
+    * Portlet's markup.</p>
     *
     * @throws javax.servlet.jsp.JspException
     * @throws java.io.IOException

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/RegionTagHandler.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag;
 
 import org.apache.log4j.Logger;
@@ -37,10 +38,9 @@
 import java.io.IOException;
 
 /**
- * Tag handler for the region tag.
- * <p>A region represents a subsection of a portal page. A region can host several portlets. The portlets can
- * be arranged horizontally or vertically. The region tag utilizes a render set to create the markup around the
- * individual portlets.</p>
+ * Tag handler for the region tag. <p>A region represents a subsection of a portal page. A region can host several
+ * portlets. The portlets can be arranged horizontally or vertically. The region tag utilizes a render set to create the
+ * markup around the individual portlets.</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @author <a href="mailto:roy at jboss.org>Roy Russo</a>
@@ -48,7 +48,7 @@
  * @see org.jboss.portal.theme.render.PortalRenderSet
  */
 public class RegionTagHandler
-      extends SimpleTagSupport
+   extends SimpleTagSupport
 {
    private static Logger log = Logger.getLogger(RegionTagHandler.class);
    //default to vertical
@@ -64,31 +64,31 @@
     */
    public void doTag() throws JspException, IOException
    {
-      if(regionCssId == null)
+      if (regionCssId == null)
       {
          regionCssId = regionName;
       }
       log.debug("rendering " + regionName + " [" + orientation + "]  cssId[" + regionCssId + "]");
 
       // get page and region
-      PageContext app = (PageContext) getJspContext();
-      HttpServletRequest request = (HttpServletRequest) app.getRequest();
+      PageContext app = (PageContext)getJspContext();
+      HttpServletRequest request = (HttpServletRequest)app.getRequest();
 
-      PageResult page = (PageResult) request.getAttribute(LayoutConstants.ATTR_PAGE);
+      PageResult page = (PageResult)request.getAttribute(LayoutConstants.ATTR_PAGE);
       JspWriter out = this.getJspContext().getOut();
-      if(page == null)
+      if (page == null)
       {
          out.write("<p bgcolor='red'>No page to render!</p>");
          out.write("<p bgcolor='red'>The page to render (PageResult) must be set in the request attribute '" +
-                   LayoutConstants.ATTR_PAGE + "'</p>");
+            LayoutConstants.ATTR_PAGE + "'</p>");
          out.flush();
          return;
       }
-      if(page.getRegion(regionName) == null) // non-window display of content
+      if (page.getRegion(regionName) == null) // non-window display of content
       {
          // create a new region obj, based on region name
          Region newRegion = new Region(regionName, regionCssId, RegionOrientation.DEFAULT);
-         RenderContext renderContext = (RenderContext) request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
+         RenderContext renderContext = (RenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
          renderContext = renderContext.getContext(newRegion, regionCssId, orientation);
          try
          {
@@ -96,7 +96,7 @@
             out.write(renderContext.getMarkupFragment().toString());
             out.flush();
          }
-         catch(RenderException e)
+         catch (RenderException e)
          {
             throw new JspException(e);
          }
@@ -104,8 +104,8 @@
       }
 
       // window-centric display of content
-      RenderContext renderContext = (RenderContext) request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
-      if(renderContext == null)
+      RenderContext renderContext = (RenderContext)request.getAttribute(LayoutConstants.ATTR_RENDERCONTEXT);
+      if (renderContext == null)
       {
          log.debug("no render context available in request");
          return;
@@ -119,7 +119,7 @@
          out.write(renderContext.getMarkupFragment().toString());
          out.flush();
       }
-      catch(RenderException e)
+      catch (RenderException e)
       {
          throw new JspException(e);
       }
@@ -136,7 +136,7 @@
     */
    public void setOrientation(String orientation)
    {
-      if(orientation == null)
+      if (orientation == null)
       {
          log.error("no null value allowed");
       }
@@ -145,7 +145,7 @@
       {
          this.orientation = RegionOrientation.parseOrientation(orientation);
       }
-      catch(IllegalArgumentException e)
+      catch (IllegalArgumentException e)
       {
          log.error(e);
          this.orientation = RegionOrientation.DEFAULT;
@@ -163,9 +163,9 @@
    }
 
    /**
-    * Attribute handler for the region id attribute of this tag
-    * <p>The region Id can be used as the value of the id attribute of the region container tag. In case of the
-    * DivRenderer render set, this is the id attribute of the div tag that represents this region on the page.</p>
+    * Attribute handler for the region id attribute of this tag <p>The region Id can be used as the value of the id
+    * attribute of the region container tag. In case of the DivRenderer render set, this is the id attribute of the div
+    * tag that represents this region on the page.</p>
     *
     * @param regionID the id attribute value to set for this tag
     */

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/ThemeTagHandler.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag;
 
 import org.jboss.logging.Logger;
@@ -35,11 +36,10 @@
 import java.io.IOException;
 
 /**
- * Tag handler for the theme tag.
- * <p>The theme tag injects theme resource links into the page. Themes are CSS files, and their resources (images).
- * The theme tag can inject only the resources of one theme at a time. The href and src attributes of the link and
- * script tags that are being injected are automatically adjusted to the war context they reside in. A theme is defined
- * in the /WEB-INF/portal-themes.xml</p>
+ * Tag handler for the theme tag. <p>The theme tag injects theme resource links into the page. Themes are CSS files, and
+ * their resources (images). The theme tag can inject only the resources of one theme at a time. The href and src
+ * attributes of the link and script tags that are being injected are automatically adjusted to the war context they
+ * reside in. A theme is defined in the /WEB-INF/portal-themes.xml</p>
  *
  * @author <a href="mailto:mholzner at novell.com>Martin Holzner</a>
  * @version $LastChangedRevision$, $LastChangedDate$
@@ -54,11 +54,11 @@
    private String themeName;
 
    /**
-    * Render the markup for theme injection into the HEAD tag.
-    * <p>This tag expects that the theme name is provided via a http request attribute, keyed by
-    * <code>LayoutConstants.ATTR_PAGE</code>. The request attribute is expected to contain a PageResult,
-    * which in turn exposes an accessor method for the active theme's name. The theme server (registry of
-    * all available themes) also has to be available via a request attribute (ThemeConstants.ATTR_THEMESERVER).</p>
+    * Render the markup for theme injection into the HEAD tag. <p>This tag expects that the theme name is provided via a
+    * http request attribute, keyed by <code>LayoutConstants.ATTR_PAGE</code>. The request attribute is expected to
+    * contain a PageResult, which in turn exposes an accessor method for the active theme's name. The theme server
+    * (registry of all available themes) also has to be available via a request attribute
+    * (ThemeConstants.ATTR_THEMESERVER).</p>
     *
     * @throws JspException
     * @throws IOException

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTEI.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag.basic;
 
 import javax.servlet.jsp.tagext.TagData;

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachActionInWindowTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag.basic;
 
 import org.jboss.portal.theme.page.WindowResult;
@@ -40,14 +41,10 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = 2573571506276549441L;
 
-   /**
-    * The action familly name parameter of the tag.
-    */
+   /** The action familly name parameter of the tag. */
    private String family;
 
-   /**
-    * Iterator over actions of the family.
-    */
+   /** Iterator over actions of the family. */
    private Iterator iterator;
 
    public String getFamily()

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTEI.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag.basic;
 
 import javax.servlet.jsp.tagext.TagData;

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/ForEachWindowInRegionTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag.basic;
 
 import org.jboss.portal.theme.LayoutConstants;
@@ -46,24 +47,16 @@
    /** The serialVersionUID */
    private static final long serialVersionUID = -6290334694176657623L;
 
-   /**
-    * .
-    */
+   /** . */
    private String region;
 
-   /**
-    * .
-    */
+   /** . */
    private Iterator iterator;
 
-   /**
-    * .
-    */
+   /** . */
    private PageResult pageResult;
 
-   /**
-    * .
-    */
+   /** . */
    private WindowResult windowResult;
 
    public String getRegion()

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionExistsTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag.basic;
 
 import org.jboss.portal.theme.LayoutConstants;

Modified: trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/main/org/jboss/portal/theme/tag/basic/IfRegionIsEmptyTag.java	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
+/******************************************************************************
+ * JBoss, a division of Red Hat                                               *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual                    *
+ * contributors as indicated by the @authors tag. See the                     *
+ * copyright.txt in the distribution for a full listing of                    *
+ * individual contributors.                                                   *
+ *                                                                            *
+ * This is free software; you can redistribute it and/or modify it            *
+ * under the terms of the GNU Lesser General Public License as                *
+ * published by the Free Software Foundation; either version 2.1 of           *
+ * the License, or (at your option) any later version.                        *
+ *                                                                            *
+ * This software is distributed in the hope that it will be useful,           *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU           *
+ * Lesser General Public License for more details.                            *
+ *                                                                            *
+ * You should have received a copy of the GNU Lesser General Public           *
+ * License along with this software; if not, write to the Free                *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA         *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.                   *
+ ******************************************************************************/
 package org.jboss.portal.theme.tag.basic;
 
 import org.jboss.portal.theme.LayoutConstants;

Modified: trunk/theme/src/resources/portal-ajax-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/theme/src/resources/portal-ajax-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/portal-ajax-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
 </jboss-web>
\ No newline at end of file

Modified: trunk/theme/src/resources/portal-ajax-war/WEB-INF/web.xml
===================================================================
--- trunk/theme/src/resources/portal-ajax-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/portal-ajax-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <!DOCTYPE web-app PUBLIC
-      "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-      "http://java.sun.com/dtd/web-app_2_3.dtd">
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
    <servlet>
       <servlet-name>DynaAjaxServlet</servlet-name>

Modified: trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-sar/META-INF/jboss-service.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <server>
 
    <!-- Theme and layout services -->

Modified: trunk/theme/src/resources/test/theme-test-sar/conf/config.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-sar/conf/config.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-sar/conf/config.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,2 +1,25 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <properties>
 </properties>

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/jboss-web.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/jboss-web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/jboss-web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <jboss-web>
 </jboss-web>
\ No newline at end of file

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-renderSet.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portal-renderSet>
    <renderSet name="divRenderer">
       <set content-type="text/html">

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/layout/portal-strategies.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <portal-strategies>
    <set name="maximizedRegion">
       <strategy content-type="text/html">

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-layouts.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <layouts>
    <!--
       <layout>

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/portal-themes.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,4 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <themes>
    <!--
       <theme>

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme/portal-layout.tld
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme/portal-layout.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme/portal-layout.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,3 +1,26 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib
    xmlns="http://java.sun.com/xml/ns/j2ee"
    xmlns:xsi="http://www.w3c.org/2001/XMLSchema-instance"

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/theme-basic-lib.tld	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,7 +1,30 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-  version="2.0">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
    <tlib-version>1.1</tlib-version>
    <short-name>Theme_basic_tags</short-name>
    <tag>

Modified: trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml
===================================================================
--- trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml	2006-10-13 18:58:37 UTC (rev 5447)
+++ trunk/theme/src/resources/test/theme-test-war/WEB-INF/web.xml	2006-10-13 19:29:17 UTC (rev 5448)
@@ -1,9 +1,32 @@
 <?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ JBoss, a division of Red Hat                                              ~
+  ~ Copyright 2006, Red Hat Middleware, LLC, and individual                   ~
+  ~ contributors as indicated by the @authors tag. See the                    ~
+  ~ copyright.txt in the distribution for a full listing of                   ~
+  ~ individual contributors.                                                  ~
+  ~                                                                           ~
+  ~ This is free software; you can redistribute it and/or modify it           ~
+  ~ under the terms of the GNU Lesser General Public License as               ~
+  ~ published by the Free Software Foundation; either version 2.1 of          ~
+  ~ the License, or (at your option) any later version.                       ~
+  ~                                                                           ~
+  ~ This software is distributed in the hope that it will be useful,          ~
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of            ~
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU          ~
+  ~ Lesser General Public License for more details.                           ~
+  ~                                                                           ~
+  ~ You should have received a copy of the GNU Lesser General Public          ~
+  ~ License along with this software; if not, write to the Free               ~
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA        ~
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.                  ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
 <web-app
-      xmlns="http://java.sun.com/xml/ns/j2ee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee  http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-      version="2.4">
+   xmlns="http://java.sun.com/xml/ns/j2ee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee  http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+   version="2.4">
 
    <servlet>
       <description>Handles test xmlhttprequests and callbacks from content rendered by the